Merge branch 'master' of github.com:koding/global.hackathon

Conflicts:
	README.md
	README.template.md

README.md

@@ -23,9 +23,14 @@ the folder with your team name and inside this folder, create two files:
 We will periodically run a script that will pull your info and populate 
 the lower section of this README.md file.
 
-| #TeamName     | Team Members | Team Page |
-|---------------|--------------|-----------|
+| #TeamName | Team Members | Team Page |
+|-----------|--------------|-----------|
 | <a target='_blank' href='https://twitter.com/home?status=Go team %23TeamKoders for @koding %23hackathon led by @sinanyasar https://koding.com/Hackathon'> <img src='https://g.twimg.com/Twitter_logo_blue.png' height='14'/> #Team Koders </a> |[Sinan Yasar](https://koding.com/sinan) San Francsico, US *(team lead)*<br>[Senthil A](https://koding.com/sent-hil) Chennai, IN<br>[Devrim Yasar](https://koding.com/devrim) San Francsico, US<br>[Nitin Gupta](https://koding.com/nitin) Turin, IT<br> | [Team Koders](./Teams/TeamKoders/ABOUT.md) |
 | <a target='_blank' href='https://twitter.com/home?status=Go team %23CallbackHell for @koding %23hackathon https://koding.com/Hackathon'> <img src='https://g.twimg.com/Twitter_logo_blue.png' height='14'/> #Callback Hell </a> |[Zlatko Duric](https://koding.com/zladuric) Munich, DE<br> | [Callback Hell](./Teams/CallbackHell/ABOUT.md) |
 | <a target='_blank' href='https://twitter.com/home?status=Go team %23CodeNotion for @koding %23hackathon led by @jabowocky https://koding.com/Hackathon'> <img src='https://g.twimg.com/Twitter_logo_blue.png' height='14'/> #CodeNotion </a> |[Michael Adam Jablecki](https://koding.com/mjablecki) Providence, US *(team lead)*<br>[Francisco Facioni](https://koding.com/fran6co) Buenos Aires, AR<br>[Ezequiel Rabinovich](https://koding.com/warseph) Santiago de Chile, CL<br> | [CodeNotion](./Teams/CodeNotion/ABOUT.md) |
+| <a target='_blank' href='https://twitter.com/home?status=Go team %23Invincibles for @koding %23hackathon led by @mani3834 https://koding.com/Hackathon'> <img src='https://g.twimg.com/Twitter_logo_blue.png' height='14'/> #Invincibles  </a> |[Manikandan Soundarapandian](https://koding.com/mani89) Cary,US *(team lead)*<br>[Ishita Malhotra](https://koding.com/ishita2310) Cary,US<br>[Harjas Ahuja](https://koding.com/harjas09) Cary,US<br> | [Invincibles ](./Teams/Invincibles/ABOUT.md) |
 | <a target='_blank' href='https://twitter.com/home?status=Go team %23JUnit for @koding %23hackathon led by @AliAkhtar_ https://koding.com/Hackathon'> <img src='https://g.twimg.com/Twitter_logo_blue.png' height='14'/> #J-Unit </a> |[Ali Akhtar](https://koding.com/digitman2) Lahore, PK *(team lead)*<br>[Bobby Degrot](https://koding.com/eonns) Boston, US<br> | [J-Unit](./Teams/J-Unit/ABOUT.md) |
+| <a target='_blank' href='https://twitter.com/home?status=Go team %23Neo for @koding %23hackathon led by @luisarriojas https://koding.com/Hackathon'> <img src='https://g.twimg.com/Twitter_logo_blue.png' height='14'/> #Neo </a> |[Luis Arriojas](https://koding.com/luisarriojas) Valencia, VE *(team lead)*<br> | [Neo](./Teams/Neo/ABOUT.md) |
+| <a target='_blank' href='https://twitter.com/home?status=Go team %23PumpedDevs for @koding %23hackathon led by @RonCabal https://koding.com/Hackathon'> <img src='https://g.twimg.com/Twitter_logo_blue.png' height='14'/> #PumpedDevs </a> |[Ron Emerson Cabal](https://koding.com/roncabal) San Pablo City, PH *(team lead)*<br>[Bryan Salazar](https://koding.com/brysalazar12) Makati City, PH<br>[Joell Lapitan](https://koding.com/jlapitan) Calamba Laguna City, PH<br>[Kenneth Sungcaya](https://koding.com/ksungcaya) Dubai, AE<br> | [PumpedDevs](./Teams/PumpedDevs/ABOUT.md) |
+| <a target='_blank' href='https://twitter.com/home?status=Go team %23T314 for @koding %23hackathon led by @zxigora https://koding.com/Hackathon'> <img src='https://g.twimg.com/Twitter_logo_blue.png' height='14'/> #T314 </a> |[Deryabin Igor](https://koding.com/glasm) Crimea, RU *(team lead)*<br> | [T314](./Teams/T314/ABOUT.md) |
+| <a target='_blank' href='https://twitter.com/home?status=Go team %23WarRoom for @koding %23hackathon https://koding.com/Hackathon'> <img src='https://g.twimg.com/Twitter_logo_blue.png' height='14'/> #WarRoom </a> |[Cameron Wright](https://koding.com/camwright) Vancouver, WA<br> | [WarRoom](./Teams/WarRoom/ABOUT.md) |

README.template.md

@@ -23,5 +23,5 @@ the folder with your team name and inside this folder, create two files:
 We will periodically run a script that will pull your info and populate 
 the lower section of this README.md file.
 
-| #TeamName     | Team Members | Team Page |
-|---------------|--------------|-----------|
+| #TeamName | Team Members | Team Page |
+|-----------|--------------|-----------|

Teams/Invincibles/ABOUT.md

@@ -0,0 +1,20 @@
+Team Invincibles
+
+================
+
+About our team
+
+===========================
+We are a group of programming enthusiasts very motivated to solve real world problems. All of us 
+are students enrolled in colleges in the United States. We decided to join this competition 
+because of our passion for programming and finding solutions for complex problems. We have prior
+experience with developing applications making use of real time data to solve everyday problems.
+Our biggest motivation behind us taking part in this competition is to get a really good 
+feel of some of the API's mentioned in the document. We do not have much experience working with
+these API's and would relish the opportunity to build something cool by utilizing them
+
+Skills and Project Idea
+
+======================
+
+Still brainstorming ideas

Teams/Invincibles/team.json

@@ -0,0 +1,22 @@
+{
+    "teamName": "Invincibles ",
+    "members": [
+        {
+            "name": "Manikandan Soundarapandian",
+            "twitter": "mani3834",
+            "koding": "mani89",
+            "location": "Cary,US",
+            "lead": true
+        },
+        {
+            "name": "Ishita Malhotra",
+            "koding": "ishita2310",
+            "location": "Cary,US"
+        },
+        {
+            "name": "Harjas Ahuja",
+            "koding": "harjas09",
+            "location": "Cary,US"
+        }
+    ]
+}

Teams/J-Unit/ABOUT.md

@@ -17,7 +17,7 @@ Our name, 'J-Unit', comes from our mutual love of hip hop and unit testing,
 mixed with the fact that we use Java as our main programming language, for both client and server side.
 
 Our biggest motivation for participating in this hackathon, is so we can have a shot at an interview
-with some of the awesome VCs which are on the judges' panel. Our dream is to do a startup,
+with some of the awesome VCs who are on the judges' panel. Our dream is to do a startup,
 and we have an awesome idea that we'd love to pitch.
 
 

Teams/Neo/ABOUT.md

@@ -0,0 +1,15 @@
+About my team
+===========================
+I am a Web Engineer with experience working with LAMP and MEAN stacks, specialized in front-end web development and web application performance. I am a U.S. citizen living in Venezuela by the moment.
+
+With the time, I have gotten senior knowledge in different technologies and functional areas of web development.
+✔ Front-End: HTML5, CSS3, JavaScript, jQuery and AngularJS.
+✔ Back-End: PHP, Ruby, Ruby on Rails, Node.js and Express.js.
+✔ Database development: MySQL and MongoDB.
+✔ Responsive Web Design.
+
+I think this hackathon brings me a great opportunity to demonstrate my skills as Web Engineer, to meet new developers around the globe, besides to push me to create a product in just 48 hours.
+
+About my skills and what I am going to do?
+=======
+I am deciding to work the theme #1 or #3, using the MEAN stack and d3.js for interactive data visualization. I hope to have time to use Foundation in order to make a beautiful webapp with responsive design.

Teams/Neo/team.json

@@ -0,0 +1,10 @@
+{
+    "teamName": "Neo",
+    "members": [{
+        "name": "Luis Arriojas",
+        "twitter": "luisarriojas",
+        "koding": "luisarriojas",
+        "location": "Valencia, VE",
+        "lead": true
+    }]
+}

Teams/PumpedDevs/ABOUT.md

@@ -0,0 +1,13 @@
+PumpedDevs
+================
+Hey! You've actually visited our page(?). We are pumpedDevs! We're thrilled to be part of the first Global Hackathon, well actually, this is the first hackthon for some of us. :)
+
+
+About your team
+===========================
+TODO
+
+
+About your skills and what you are going to do?
+=======
+TODO

Teams/PumpedDevs/team.json

@@ -0,0 +1,29 @@
+{
+"teamName": "PumpedDevs",
+"members": [
+{
+"name": "Bryan Salazar",
+"koding": "brysalazar12",
+"location": "Makati City, PH"
+},
+{
+"name": "Ron Emerson Cabal",
+"twitter": "RonCabal",
+"koding": "roncabal",
+"lead": true,
+"location": "San Pablo City, PH"
+},
+{
+"name": "Joell Lapitan",
+"twitter": "jlapitan",
+"koding": "jlapitan",
+"location": "Calamba Laguna City, PH"
+},
+{
+"name": "Kenneth Sungcaya",
+"twitter": "ksungcaya",
+"koding": "ksungcaya",
+"location": "Dubai, AE"
+}
+]
+}

Teams/T314/ABOUT.md

@@ -0,0 +1,11 @@
+T314
+================
+
+I'm a freelance developer, interested in Web development
+#hackathon – a good incentive to apply my knowledge of different areas in a single project
+
+My goal is not to win, it's a challenge for me – in a short period of time to create a project that will be useful for many people
+
+the most interesting theme for me is "HTML5 educational multiplayer game"
+
+I will use PHP + node.js + iron.io and WebGL + Canvas... may also WebSpeechAPI

Teams/T314/team.json

@@ -0,0 +1,12 @@
+{
+  "teamName": "T314",
+  "members": [
+    {
+      "name": "Deryabin Igor",
+      "twitter": "zxigora",
+      "koding": "glasm",
+      "location": "Crimea, RU",
+      "lead": true
+    }
+  ]
+}

Teams/TeamKoders/ABOUT.md

@@ -7,6 +7,11 @@ to give you an idea about your own page.
 
 About your team
 ===========================
+
+| devrim | nitin | sinan | emre
+|--- |--- |--- |---
+| ![Devrim](https://pbs.twimg.com/profile_images/378800000863144334/uZWGPcJz_400x400.jpeg) | ![Nitin](https://pbs.twimg.com/profile_images/1416284972/NitinGupta-1.jpg) | ![Sinan](https://pbs.twimg.com/profile_images/533920104249954305/8KZPcvIa.jpeg) | ![Emre](https://pbs.twimg.com/profile_images/513260359398871040/z-_436ig.jpeg) |
+
 Tell us who you are, why you did you decide to join?
 
 Judges will read this page before making a final decision, so write your story, make it emotional and impressive.

Teams/WarRoom/ABOUT.md

@@ -0,0 +1 @@
+COMING SOON

Teams/WarRoom/team.json

@@ -0,0 +1,10 @@
+{
+  "teamName": "WarRoom",
+  "members": [
+    {
+      "name": "Cameron Wright",
+      "koding": "camwright",
+      "location": "Vancouver, WA"
+    }
+  ]
+}