From f9cd9c85ef952b2c504164a78a100d15a0250bd0 Mon Sep 17 00:00:00 2001
From: silbo <silver.kuusik@gmail.com>
Date: Wed, 3 Dec 2014 17:31:56 +0100
Subject: [PATCH 1/4] Update team.js

---
 Teams/ninjasinthebox/team.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Teams/ninjasinthebox/team.js b/Teams/ninjasinthebox/team.js
index 9b85553..ba00d3b 100644
--- a/Teams/ninjasinthebox/team.js
+++ b/Teams/ninjasinthebox/team.js
@@ -19,6 +19,12 @@
       "twitter": "",
       "koding": "morriswinkler",
       "location": "Berlin, DE"
+    },
+    {
+      "name": "kris",
+      "twitter": "",
+      "koding": "kriskros",
+      "location": "Berlin, DE"
     }
   ]
 }

From 1ed35f22c11cf3c566b494d1255c15421c134ca1 Mon Sep 17 00:00:00 2001
From: silbo <silver.kuusik@gmail.com>
Date: Wed, 3 Dec 2014 17:39:29 +0100
Subject: [PATCH 2/4] Update ABOUT.md

---
 Teams/ninjasinthebox/ABOUT.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Teams/ninjasinthebox/ABOUT.md b/Teams/ninjasinthebox/ABOUT.md
index 75ffd6c..cd3ee9e 100644
--- a/Teams/ninjasinthebox/ABOUT.md
+++ b/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](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 <br> roboninja | dono <br> webninja | morris <br> 3Dninja | kris <br> interactiveninja |
+|---|---|---|---|
+| ![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"> |
 
 story
 =====
@@ -18,6 +18,7 @@ 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>
 
 mizzion
 =======

From 00a8ad2f953b0fe71afed3c591a0867459f0a2ac Mon Sep 17 00:00:00 2001
From: silbo <silver.kuusik@gmail.com>
Date: Wed, 3 Dec 2014 18:10:09 +0100
Subject: [PATCH 3/4] Update team.js

---
 Teams/ninjasinthebox/team.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Teams/ninjasinthebox/team.js b/Teams/ninjasinthebox/team.js
index ba00d3b..ed83b97 100644
--- a/Teams/ninjasinthebox/team.js
+++ b/Teams/ninjasinthebox/team.js
@@ -25,6 +25,12 @@
       "twitter": "",
       "koding": "kriskros",
       "location": "Berlin, DE"
+    },
+    {
+      "name": "joan",
+      "twitter": "",
+      "koding": "joan",
+      "location": "Berlin, DE"
     }
   ]
 }

From 5056c179075099eb4c149f81867ecf68cb22db0d Mon Sep 17 00:00:00 2001
From: silbo <silver.kuusik@gmail.com>
Date: Wed, 3 Dec 2014 18:12:54 +0100
Subject: [PATCH 4/4] Update ABOUT.md

---
 Teams/ninjasinthebox/ABOUT.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Teams/ninjasinthebox/ABOUT.md b/Teams/ninjasinthebox/ABOUT.md
index cd3ee9e..088ef10 100644
--- a/Teams/ninjasinthebox/ABOUT.md
+++ b/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 | kris <br> interactiveninja |
-|---|---|---|---|
-| ![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"> |
+| 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"> | <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
 =====
@@ -19,6 +19,7 @@ our ninja skillz
 <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
 =======