Merge pull request #118 from phantomkirby/master

Added A New Team Member and Removed and Old One

Teams/Gundam/ABOUT.md

@@ -8,15 +8,15 @@ Hello, we are a team mostly from Japan (Tokyo), except for one of us, Fan, that
 
 Although there is an explosion in the popularity of computer science in the United States and such, computer science and engineering is still looked down upon in Japan. Engineers are looked down upon in Japan. We want to change this mindset. If we win, we want to use this opportunity and make it so that all Japanese people will realize the power and potential of coding, computer science, and hackathons!
 
-Fanさん以外、私たちは日本にいても、Fanさんも日本が好きです！アメリカなどでは情報工学はもっと大人気になるのに、日本ではまだ工学部は人気ではありません。私たちはその考えを変えたい。もし勝てば、この機会で全部の日本人に情報工学とハッカソンの力と可能性をきづかせます。
+Fanさん以外、私たちは日本にいても、Fanさんも日本が好きです！アメリカなどでは情報工学はもっと大人気になるのに、日本ではまだ工学部は人気ではありません。私たちはその考えを変えたい。もし勝てば、この機会で全部の日本人に情報工学とハッカソンの力と可能性を気づかせます。 
 
 
 About Our Team
 ===========================
 
-| Jumpei | Cherry | 吴昌龙 | Fan
-|--- |--- |--- |---
-| ![Jumpei](https://media.licdn.com/mpr/mpr/shrink_200_200/p/7/005/06d/198/380d5cd.jpg) | ![Cherry](https://media.licdn.com/mpr/mpr/shrink_200_200/p/7/005/08c/262/22146e7.jpg) | ![吴昌龙](https://media.licdn.com/mpr/mpr/shrink_200_200/p/7/005/081/2da/294f62e.jpg) | ![Fan](https://media.licdn.com/mpr/mpr/shrink_200_200/p/4/005/050/1b8/207f073.jpg) |
+| Jumpei | Cherry | Fan | Tommy
+|--- |--- |--- |--- |---
+| ![Jumpei](https://media.licdn.com/mpr/mpr/shrink_200_200/p/7/005/06d/198/380d5cd.jpg) | ![Cherry](https://media.licdn.com/mpr/mpr/shrink_200_200/p/7/005/08c/262/22146e7.jpg) | ![Fan](https://media.licdn.com/mpr/mpr/shrink_200_200/p/4/005/050/1b8/207f073.jpg) | ![Tommy](https://media.licdn.com/mpr/mpr/shrink_200_200/p/3/005/03b/293/05fbee6.jpg)
 
 
 Jumpei
@@ -27,10 +27,10 @@ Cherry
 =======
 Cherry is an engineering student at the University of Waterloo, and has a lot of Android and Java experience. She is passionate about Android development, technology, and internet of things. She is currently interning at Microsoft and wants to learn more web development from this hackathon. She will be one of the engineers of this team. She also really likes Gundam. [Website](http://cherryzhang.net)
 
-吴昌龙
-=======
-吴昌龙 is an accomplished software engineer and has earned a Masters degree in computer science at Beijing University of Posts & Telecommunications, and has three years of experience in C++, Linux, web development, and has recently been developing in Ruby. Currently he is working at Rakuten, the largest e-commerce site in Japan, and among the world's largest in sales. He will be one of the engineers on this team. [LinkedIn](https://www.linkedin.com/pub/changlong-wu/7a/614/248)
-
 Fan
 =======
 Fan is an ambitious engineer at the University of Waterloo, and has been doing front-end web development, and also recently back-end development as well (PHP and MySQL). He will be one of the engineers on this team. He also really likes Gundam. [Website](http://thefanzhang.com/)
+
+Tommy
+=======
+Tommy just recently started app development and web development, and he has fallen in love with it. He is an engineer at the University of Waterloo, and has learned a lot of languages very quickly, including python, iOS development, html, css, and JavaScript. [Facebook](https://www.facebook.com/tommyjungis)

Teams/Gundam/team.json

@@ -14,17 +14,17 @@
       "location": "Tokyo, JP",
       "lead": true
     },
-    {
-      "name": "吴昌龙",
-      "twitter": "clongbupt",
-      "koding": "colon",
-      "location": "Tokyo, JP"
-    },
     {
       "name": "Fan Zhang",
       "twitter": "fanwashere",
       "koding": "fanwashere",
       "location": "Ottawa, CA"
+    },
+    {
+      "name": "Tommy Jung",
+      "twitter": "TommmYeee",
+      "koding": "younghj",
+      "location": "Toronto, CA"
     }
   ]
 }