Merge pull request #975 from silps/master

ninjasinthebox new member

Teams/ninjasinthebox/ABOUT.md

@@ -5,9 +5,9 @@ We are ninjasinthebox, the most awesome ninjas in a box. <br>
 
 teamzor
 =======
-| silbo <br> roboninja | dono <br> webninja | morris <br> 3Dninja |
+| silbo <br> roboninja | dono <br> webninja | morris <br> 3Dninja | kris <br> interactiveninja | joan <br> artninja |
-|--- |--- |---|
+|---|---|---|---|---|
-| ![silbo](https://avatars1.githubusercontent.com/u/802834?v=3&s=160) | ![dono](https://avatars1.githubusercontent.com/u/4045902?v=3&s=160) | <img height="160px" src="https://avatars1.githubusercontent.com/u/4302527?v=3&s=160" alt="morris"> |
+| ![silbo](https://avatars1.githubusercontent.com/u/802834?v=3&s=160) | ![dono](https://avatars1.githubusercontent.com/u/4045902?v=3&s=160) | <img height="160px" src="https://avatars1.githubusercontent.com/u/4302527?v=3&s=160" alt="morris"> | <img height="160px" src="https://avatars3.githubusercontent.com/u/817241?v=3&s=160" alt="kris"> | <img height="160px" src="https://avatars1.githubusercontent.com/u/4304527?v=3&s=160" alt="joan">
 
 story
 =====
@@ -18,6 +18,8 @@ our ninja skillz
 <strong>silbo</strong> is a first class roboninja. <br>
 <strong>dono</strong> is a first class webninja. <br>
 <strong>morris</strong> is a first class 3Dninja. <br>
+<strong>kris</strong> is a first class interactiveninja. <br>
+<strong>joan</strong> is a first class artninja. <br>
 
 mizzion
 =======

Teams/ninjasinthebox/team.js

@@ -19,6 +19,18 @@
       "twitter": "",
       "koding": "morriswinkler",
       "location": "Berlin, DE"
+    },
+    {
+      "name": "kris",
+      "twitter": "",
+      "koding": "kriskros",
+      "location": "Berlin, DE"
+    },
+    {
+      "name": "joan",
+      "twitter": "",
+      "koding": "joan",
+      "location": "Berlin, DE"
     }
   ]
 }