From 995d719f33e0e050e0978f2d97b82b0944e740a6 Mon Sep 17 00:00:00 2001 From: phantomkirby Date: Mon, 24 Nov 2014 19:01:38 +0900 Subject: [PATCH 1/7] edited description --- Teams/Gundam/ABOUT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/Gundam/ABOUT.md b/Teams/Gundam/ABOUT.md index 04e0b89..2e5bc4b 100644 --- a/Teams/Gundam/ABOUT.md +++ b/Teams/Gundam/ABOUT.md @@ -5,7 +5,7 @@ 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 From a0662744911547ec026137c0ce78a086d15a0d42 Mon Sep 17 00:00:00 2001 From: phantomkirby Date: Tue, 25 Nov 2014 23:12:27 +0900 Subject: [PATCH 2/7] added Tommy --- Teams/Gundam/ABOUT.md | 10 +++++++--- Teams/Gundam/team.json | 6 ++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Teams/Gundam/ABOUT.md b/Teams/Gundam/ABOUT.md index 2e5bc4b..bf05759 100644 --- a/Teams/Gundam/ABOUT.md +++ b/Teams/Gundam/ABOUT.md @@ -11,9 +11,9 @@ Fanさん以外、私たちは日本にいても、Fanさんも日本が好き About Our Team =========================== -| Jumpei | Cherry | 吴昌龙 | Fan +| 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) | ![吴昌龙](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](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) | [Tommy](https://media.licdn.com/mpr/mpr/shrink_200_200/p/3/005/03b/293/05fbee6.jpg) Jumpei @@ -30,4 +30,8 @@ Cherry is an engineering student at the University of Waterloo, and has a lot of 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/) \ No newline at end of file +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. \ No newline at end of file diff --git a/Teams/Gundam/team.json b/Teams/Gundam/team.json index 0825570..bd8516a 100644 --- a/Teams/Gundam/team.json +++ b/Teams/Gundam/team.json @@ -25,6 +25,12 @@ "twitter": "fanwashere", "koding": "fanwashere", "location": "Ottawa, CA" + }, + { + "name": "Tommy Jung", + "twitter": "TommmYeee", + "koding": "younghj", + "location": "Toronto, CA" } ] } \ No newline at end of file From 85d548ef1088e8fa94146ddb64a0460f9443150e Mon Sep 17 00:00:00 2001 From: phantomkirby Date: Tue, 25 Nov 2014 23:15:28 +0900 Subject: [PATCH 3/7] fixed formatting --- Teams/Gundam/ABOUT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/Gundam/ABOUT.md b/Teams/Gundam/ABOUT.md index 66676cf..7d3d0b7 100644 --- a/Teams/Gundam/ABOUT.md +++ b/Teams/Gundam/ABOUT.md @@ -15,7 +15,7 @@ About Our Team =========================== | 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) | ![吴昌龙](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) | [Tommy](https://media.licdn.com/mpr/mpr/shrink_200_200/p/3/005/03b/293/05fbee6.jpg) From a86b5e69695e2122c17807e8f062d0efd3f0aa95 Mon Sep 17 00:00:00 2001 From: phantomkirby Date: Tue, 25 Nov 2014 23:16:07 +0900 Subject: [PATCH 4/7] fixed tommys pic --- Teams/Gundam/ABOUT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/Gundam/ABOUT.md b/Teams/Gundam/ABOUT.md index 7d3d0b7..616c3d4 100644 --- a/Teams/Gundam/ABOUT.md +++ b/Teams/Gundam/ABOUT.md @@ -16,7 +16,7 @@ About Our Team | 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) | ![吴昌龙](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) | [Tommy](https://media.licdn.com/mpr/mpr/shrink_200_200/p/3/005/03b/293/05fbee6.jpg) +| ![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) | ![Tommy](https://media.licdn.com/mpr/mpr/shrink_200_200/p/3/005/03b/293/05fbee6.jpg) Jumpei From 37760b1942454309899ecaf25e4201aec7056d22 Mon Sep 17 00:00:00 2001 From: phantomkirby Date: Tue, 25 Nov 2014 23:16:54 +0900 Subject: [PATCH 5/7] font trouble --- Teams/Gundam/ABOUT.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/Teams/Gundam/ABOUT.md b/Teams/Gundam/ABOUT.md index 616c3d4..a59def8 100644 --- a/Teams/Gundam/ABOUT.md +++ b/Teams/Gundam/ABOUT.md @@ -34,10 +34,7 @@ Cherry is an engineering student at the University of Waterloo, and has a lot of 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/) -<<<<<<< HEAD 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. -======= ->>>>>>> 784175de43380cc1ae4cd1ad6cd4a07ed39bc008 From 567955f27d86f06607adee3bc3e2c925932363a3 Mon Sep 17 00:00:00 2001 From: phantomkirby Date: Tue, 25 Nov 2014 23:18:27 +0900 Subject: [PATCH 6/7] tommy facebook link --- Teams/Gundam/ABOUT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/Gundam/ABOUT.md b/Teams/Gundam/ABOUT.md index a59def8..271c47b 100644 --- a/Teams/Gundam/ABOUT.md +++ b/Teams/Gundam/ABOUT.md @@ -37,4 +37,4 @@ Fan is an ambitious engineer at the University of Waterloo, and has been doing f 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. +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) From cac8f25a1dd4d6d5b866268b5e2de49f5040de19 Mon Sep 17 00:00:00 2001 From: phantomkirby Date: Tue, 25 Nov 2014 23:33:32 +0900 Subject: [PATCH 7/7] removed one team member --- Teams/Gundam/ABOUT.md | 8 ++------ Teams/Gundam/team.json | 6 ------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Teams/Gundam/ABOUT.md b/Teams/Gundam/ABOUT.md index 271c47b..58b4fec 100644 --- a/Teams/Gundam/ABOUT.md +++ b/Teams/Gundam/ABOUT.md @@ -14,9 +14,9 @@ Fanさん以外、私たちは日本にいても、Fanさんも日本が好き About Our Team =========================== -| Jumpei | Cherry | 吴昌龙 | Fan | Tommy +| 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) | ![吴昌龙](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) | ![Tommy](https://media.licdn.com/mpr/mpr/shrink_200_200/p/3/005/03b/293/05fbee6.jpg) +| ![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,6 @@ 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/) diff --git a/Teams/Gundam/team.json b/Teams/Gundam/team.json index bd8516a..4aa05dd 100644 --- a/Teams/Gundam/team.json +++ b/Teams/Gundam/team.json @@ -14,12 +14,6 @@ "location": "Tokyo, JP", "lead": true }, - { - "name": "吴昌龙", - "twitter": "clongbupt", - "koding": "colon", - "location": "Tokyo, JP" - }, { "name": "Fan Zhang", "twitter": "fanwashere",