From 30766957ee31bc51758402a44b04db193f17fe00 Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Sun, 30 Nov 2014 11:57:43 +0800 Subject: [PATCH 01/17] Created ABOUT.md + About the Team Section + About Us Section + Filled Michael Leng Section + Our Combined Skillset Section + Filled Our Combined Skillset Section + Our Plan Section --- Teams/0aTempTeam/ABOUT.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Teams/0aTempTeam/ABOUT.md diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md new file mode 100644 index 0000000..d3a7939 --- /dev/null +++ b/Teams/0aTempTeam/ABOUT.md @@ -0,0 +1,31 @@ +#About The Team + +Stuff Here + +#About Us + +###Michael Leng + +![Michael](https://www.synergi.cc/ProfileSquareMediumJPG.jpg) + +Hello, I am Michael Leng, an aspiring 16 year old high school hacker. I mainly work with web languages, but have dabbled in languages like Java and C++. I enjoy coding for fun, skiing, and gaming. My main role in this competition will be front end development and design, as well as the coordination of the activities of other team members. This is my first hackathon, and I am extremely excited to participate. + +###Add Your Name + +###Add Your Name + +#Our Combined Skillset + +HTML5 +CSS3 +JavaScript +jQuery +Node +PHP +(Add more) + +#Our Plan + +Stuff Here + +#Thanks for Reading! From b6e273c800c9aa1709f69f097ddb4eebb0aa9d3a Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Sun, 30 Nov 2014 11:59:56 +0800 Subject: [PATCH 02/17] Created team.json + Everyone --- Teams/0aTempTeam/team.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Teams/0aTempTeam/team.json diff --git a/Teams/0aTempTeam/team.json b/Teams/0aTempTeam/team.json new file mode 100644 index 0000000..e9c02bf --- /dev/null +++ b/Teams/0aTempTeam/team.json @@ -0,0 +1,24 @@ +{ + "teamName": "We need a team name", + "members": [ + { + "name": "Michael Leng", + "twitter": "Michael_Leng", + "koding": "xsynergi", + "location": "Shanghai, CN" + "lead": true + }, + { + "name": "Max Campbell", + "twitter": "initd_daemon", + "koding": "initdaemon", + "location": "Manchester, UK" + }, + { + "name": "Dennis Planting", + "twitter": "tryy3mc", + "koding": "tryy3", + "location": "Kumla, SE" + } + ] +} From e0f3c13c681c8b3ecbbe939d635f4778204dec4e Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Sun, 30 Nov 2014 14:28:40 +0800 Subject: [PATCH 03/17] Updated ABOUT.md + Added Dennis' Section + Filled Dennis' Section + Added Max's Section + Filled Our Plan Section + Modified Michael's Section --- Teams/0aTempTeam/ABOUT.md | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index d3a7939..4c02bea 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -8,11 +8,17 @@ Stuff Here ![Michael](https://www.synergi.cc/ProfileSquareMediumJPG.jpg) -Hello, I am Michael Leng, an aspiring 16 year old high school hacker. I mainly work with web languages, but have dabbled in languages like Java and C++. I enjoy coding for fun, skiing, and gaming. My main role in this competition will be front end development and design, as well as the coordination of the activities of other team members. This is my first hackathon, and I am extremely excited to participate. +Hello, I am Michael Leng, an aspiring 16 year old high school hacker. I initially started working with computers at the age of around 8, and started messing around with programming around 5 years ago. I mainly work with web languages, but have dabbled in languages like Java and C++. I enjoy coding for fun, skiing, and gaming. My main role in this competition will be front end development and design, as well as the coordination of the activities of other team members. This is my first hackathon, and I am extremely excited to participate. -###Add Your Name +###Max Campbell -###Add Your Name +Add your bio here. + +###Dennis Planting + +![Dennis](https://www.dropbox.com/s/4rh7alby1sqxsmn/unicorn2.jpg?dl=0) + +Hello, I am Dennis Planting, I am 16 years old and from Sweden, I am a programmer and a server administrator. I have knowledge of multiple language ranging from simple languages like LUA, javascript etc. up to languages like c++, Java etc. I enjoy anything related to technology like coding, gaming, fixing hardware etc. I can't call my self an expert in most areas, I am fairly well rounded in everything, so my main role will be helping in multiple areas at once and helping where others know less. #Our Combined Skillset @@ -22,10 +28,17 @@ JavaScript jQuery Node PHP +Java +C# +C++ +C Programing +Python +Ruby +Lua (Add more) #Our Plan -Stuff Here +Our plan is to make a html5 based game that teaches beginners how to code in a unique and new way. #Thanks for Reading! From 78735b810f046f8e960f5c942473c6239e209dc8 Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Sun, 30 Nov 2014 14:43:49 +0800 Subject: [PATCH 04/17] Updated ABOUT.md + Fixed Dennis' Image URL --- Teams/0aTempTeam/ABOUT.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index 4c02bea..2cdcf58 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -16,9 +16,12 @@ Add your bio here. ###Dennis Planting -![Dennis](https://www.dropbox.com/s/4rh7alby1sqxsmn/unicorn2.jpg?dl=0) +![Dennis](https://www.synergi.cc/tryyPic.jpg) -Hello, I am Dennis Planting, I am 16 years old and from Sweden, I am a programmer and a server administrator. I have knowledge of multiple language ranging from simple languages like LUA, javascript etc. up to languages like c++, Java etc. I enjoy anything related to technology like coding, gaming, fixing hardware etc. I can't call my self an expert in most areas, I am fairly well rounded in everything, so my main role will be helping in multiple areas at once and helping where others know less. +Hello, I am Dennis Planting, I am 16 years old and from Sweden, I am a programmer and a server administrator. +I have knowledge of multiple language ranging from simple languages like LUA, javascript etc. up to languages like c++, Java etc. +I enjoy anything related to technology like coding, gaming, fixing hardware etc. +I can't call my self an expert in most areas, I am fairly well rounded in everything, so my main role will be helping in multiple areas at once and helping where others know less. #Our Combined Skillset @@ -40,5 +43,6 @@ Lua #Our Plan Our plan is to make a html5 based game that teaches beginners how to code in a unique and new way. +We will be using html5 mostly for the client side and node.js for the server side and mongodb for the db, we might also throw in some scripting languages if needed too. #Thanks for Reading! From 5159eec3d2b9e3a256b91de86cc6e3152cd31d95 Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Sun, 30 Nov 2014 14:50:34 +0800 Subject: [PATCH 05/17] Updated ABOUT.md + Fixed Grammar & Spelling Issues --- Teams/0aTempTeam/ABOUT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index 2cdcf58..18e2f22 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -43,6 +43,6 @@ Lua #Our Plan Our plan is to make a html5 based game that teaches beginners how to code in a unique and new way. -We will be using html5 mostly for the client side and node.js for the server side and mongodb for the db, we might also throw in some scripting languages if needed too. +We will be using HTML5 and CSS3 mostly for client side and node.js for the server side and mongodb for the database, we might also throw in some scripting languages if needed too. #Thanks for Reading! From e6148d28961ab153da7cf0a656dec5968fa72bee Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Sun, 30 Nov 2014 14:51:54 +0800 Subject: [PATCH 06/17] Updated ABOUT.md + Fixed Dennis' Picture Again --- Teams/0aTempTeam/ABOUT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index 18e2f22..56046d6 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -16,7 +16,7 @@ Add your bio here. ###Dennis Planting -![Dennis](https://www.synergi.cc/tryyPic.jpg) +![Dennis](https://www.synergi.cc/tryyPic500.jpg) Hello, I am Dennis Planting, I am 16 years old and from Sweden, I am a programmer and a server administrator. I have knowledge of multiple language ranging from simple languages like LUA, javascript etc. up to languages like c++, Java etc. From 7a4c65aad9bd27eba8b0bedcc8d485ee0ce42a43 Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Sun, 30 Nov 2014 22:15:32 +0800 Subject: [PATCH 07/17] Updated ABOUT.md + Filled About The Team Section + Filled Max's Section + Modified Our Combined Skillset Section + Modified Our Plan Section + Modified Farewell --- Teams/0aTempTeam/ABOUT.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index 56046d6..e01c86f 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -1,6 +1,6 @@ #About The Team -Stuff Here +We are a group of friends of high school students and technology enthusiasts. We specialize in front and back end web development. This is also our first time working together on a large project. Each of us have our own skillset, and we feel like together we make a strong team. Altogether we are extremely excited for this Hackathon, and are planning to utilize our skills to the fullest to create an awesome web application. We all view this Hackathon as an amazing opportunity to improve and sharpen our skills, contribute to the Koding community, and raise awareness to help create the next generation of hackers. #About Us @@ -12,16 +12,13 @@ Hello, I am Michael Leng, an aspiring 16 year old high school hacker. I initiall ###Max Campbell -Add your bio here. +Hi, I am Max Campbell, a 16 year old coder and general computer enthusiast from the uk. I started playing with computers at about the age of 7-8 (with bash scripts). I soon started codeing with php and dabbled in other lanaguges like C and Java, but loved the portability of the web. Now I mainly code in Node and am best at all things back end related. This is my 3rd hackathon but the other two were one week long and aimed at people my age. ###Dennis Planting ![Dennis](https://www.synergi.cc/tryyPic500.jpg) -Hello, I am Dennis Planting, I am 16 years old and from Sweden, I am a programmer and a server administrator. -I have knowledge of multiple language ranging from simple languages like LUA, javascript etc. up to languages like c++, Java etc. -I enjoy anything related to technology like coding, gaming, fixing hardware etc. -I can't call my self an expert in most areas, I am fairly well rounded in everything, so my main role will be helping in multiple areas at once and helping where others know less. +Hello, I am Dennis Planting, I am 16 years old and from Sweden. I am a programmer and a server administrator. I have knowledge of multiple languages ranging from simpler languages like LUA and JavaScript up to languages like C++, Java and so on. I enjoy anything related to technology like coding, gaming, hardware hacking, etc. I can't call my self an expert in most areas, but I am fairly well rounded in everything, so my main role will be helping in multiple areas as well as helping where others know less. #Our Combined Skillset @@ -42,7 +39,6 @@ Lua #Our Plan -Our plan is to make a html5 based game that teaches beginners how to code in a unique and new way. -We will be using HTML5 and CSS3 mostly for client side and node.js for the server side and mongodb for the database, we might also throw in some scripting languages if needed too. +Our current plan is to make a HTML5 based game that teaches beginners how to code in a unique and new way. We will be using HTML5 and CSS3 as well as JavaScript, jQuery, and Node.js. For back end we will be using MongoDB for the database. We might also throw in some other scripting languages if needed. This plan and the API's we are planning to use as listed here is tentative. -#Thanks for Reading! +#Thanks for Reading, and good luck to all the other teams! From e34011f9a1db0aa2177e0e6070221ce7d7ce9668 Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Sun, 30 Nov 2014 22:18:03 +0800 Subject: [PATCH 08/17] Updated ABOUT.md + Modified Our Combined Skillset Section --- Teams/0aTempTeam/ABOUT.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index e01c86f..a139642 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -22,20 +22,19 @@ Hello, I am Dennis Planting, I am 16 years old and from Sweden. I am a programme #Our Combined Skillset -HTML5 -CSS3 -JavaScript -jQuery -Node -PHP -Java -C# -C++ -C Programing -Python -Ruby +HTML5, +CSS3, +JavaScript, +jQuery, +Node, +PHP, +Java, +C#, +C++, +C, +Python, +Ruby, Lua -(Add more) #Our Plan From c71716fdb3922a37fabc421cae015a1a9b6f978c Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Sun, 30 Nov 2014 22:26:52 +0800 Subject: [PATCH 09/17] Updated ABOUT.md + Modified Max's Section --- Teams/0aTempTeam/ABOUT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index a139642..a475579 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -12,13 +12,13 @@ Hello, I am Michael Leng, an aspiring 16 year old high school hacker. I initiall ###Max Campbell -Hi, I am Max Campbell, a 16 year old coder and general computer enthusiast from the uk. I started playing with computers at about the age of 7-8 (with bash scripts). I soon started codeing with php and dabbled in other lanaguges like C and Java, but loved the portability of the web. Now I mainly code in Node and am best at all things back end related. This is my 3rd hackathon but the other two were one week long and aimed at people my age. +Hi, I am Max Campbell, a 16 year old coder and general computer enthusiast from the UK. I started playing with computers at about the age of 7-8 (with bash scripts). I soon started coding with php and dabbled in other lanaguges like C and Java, but loved the portability of the web. Now I mainly work with Node and am best at all things back end related. This is my 3rd hackathon; the other two were one week long and aimed at people my age. ###Dennis Planting ![Dennis](https://www.synergi.cc/tryyPic500.jpg) -Hello, I am Dennis Planting, I am 16 years old and from Sweden. I am a programmer and a server administrator. I have knowledge of multiple languages ranging from simpler languages like LUA and JavaScript up to languages like C++, Java and so on. I enjoy anything related to technology like coding, gaming, hardware hacking, etc. I can't call my self an expert in most areas, but I am fairly well rounded in everything, so my main role will be helping in multiple areas as well as helping where others know less. +Hello, I am Dennis Planting. I am 16 years old and from Sweden. I am a programmer and a server administrator. I have knowledge of multiple languages ranging from simpler languages like LUA and JavaScript up to languages like C++, Java and so on. I enjoy anything related to technology like coding, gaming, hardware hacking, etc. I can't call my self an expert in most areas, but I am fairly well rounded in everything, so my main role will be helping in multiple areas as well as helping where others know less. #Our Combined Skillset From 4a4273c3b432449ac10898ae419cc6aa729e38d1 Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Sun, 30 Nov 2014 23:14:22 +0800 Subject: [PATCH 10/17] Updated ABOUT.md + Added Max's Picture --- Teams/0aTempTeam/ABOUT.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index a475579..bccfec1 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -12,7 +12,9 @@ Hello, I am Michael Leng, an aspiring 16 year old high school hacker. I initiall ###Max Campbell -Hi, I am Max Campbell, a 16 year old coder and general computer enthusiast from the UK. I started playing with computers at about the age of 7-8 (with bash scripts). I soon started coding with php and dabbled in other lanaguges like C and Java, but loved the portability of the web. Now I mainly work with Node and am best at all things back end related. This is my 3rd hackathon; the other two were one week long and aimed at people my age. +![Max](https://www.synergi.cc/maxPic500.jpg) + +Hi, I am Max Campbell, a 16 year old coder and general computer enthusiast from the UK. I started playing with computers at about the age of 7-8 (with bash scripts). I then started coding with php and dabbled in other lanaguges like C and Java, but loved the portability of the web. Now I mainly work with Node and am best at all things back end related. This is my 3rd hackathon; the other two were one week long and aimed at people my age. ###Dennis Planting From 6557138ac4aa2174dbc4446630ef2340aee71da8 Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Mon, 1 Dec 2014 12:02:50 +0800 Subject: [PATCH 11/17] Updated ABOUT.md + Roles --- Teams/0aTempTeam/ABOUT.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index bccfec1..a4d5484 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -6,18 +6,24 @@ We are a group of friends of high school students and technology enthusiasts. We ###Michael Leng +Project Lead, Front End Developer, UI Designer + ![Michael](https://www.synergi.cc/ProfileSquareMediumJPG.jpg) Hello, I am Michael Leng, an aspiring 16 year old high school hacker. I initially started working with computers at the age of around 8, and started messing around with programming around 5 years ago. I mainly work with web languages, but have dabbled in languages like Java and C++. I enjoy coding for fun, skiing, and gaming. My main role in this competition will be front end development and design, as well as the coordination of the activities of other team members. This is my first hackathon, and I am extremely excited to participate. ###Max Campbell +Back End Developer + ![Max](https://www.synergi.cc/maxPic500.jpg) Hi, I am Max Campbell, a 16 year old coder and general computer enthusiast from the UK. I started playing with computers at about the age of 7-8 (with bash scripts). I then started coding with php and dabbled in other lanaguges like C and Java, but loved the portability of the web. Now I mainly work with Node and am best at all things back end related. This is my 3rd hackathon; the other two were one week long and aimed at people my age. ###Dennis Planting +Full Stack Developer + ![Dennis](https://www.synergi.cc/tryyPic500.jpg) Hello, I am Dennis Planting. I am 16 years old and from Sweden. I am a programmer and a server administrator. I have knowledge of multiple languages ranging from simpler languages like LUA and JavaScript up to languages like C++, Java and so on. I enjoy anything related to technology like coding, gaming, hardware hacking, etc. I can't call my self an expert in most areas, but I am fairly well rounded in everything, so my main role will be helping in multiple areas as well as helping where others know less. From 225b4c97c6a6272b607c418860373cd27f808567 Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Mon, 1 Dec 2014 18:50:03 +0800 Subject: [PATCH 12/17] Updated ABOUT.md + Modified Our Plan --- Teams/0aTempTeam/ABOUT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index a4d5484..7c07ca7 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -46,6 +46,6 @@ Lua #Our Plan -Our current plan is to make a HTML5 based game that teaches beginners how to code in a unique and new way. We will be using HTML5 and CSS3 as well as JavaScript, jQuery, and Node.js. For back end we will be using MongoDB for the database. We might also throw in some other scripting languages if needed. This plan and the API's we are planning to use as listed here is tentative. +Our current plan is to make a HTML5 based game that teaches beginners how to code in a unique and new way. We will be using HTML5 and CSS3 as well as JavaScript, jQuery, and Node.js. We will also be using MongoDB for the database. We might also throw in some other scripting languages if needed. This plan and the API's we are planning to use as listed here is tentative. #Thanks for Reading, and good luck to all the other teams! From b583be432071b8fa0fc3a728050c32c5e64379c9 Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Wed, 3 Dec 2014 09:53:58 +0800 Subject: [PATCH 13/17] Updated ABOUT.md + Is Dennis a Unicorn? --- Teams/0aTempTeam/ABOUT.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index 7c07ca7..ca94dda 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -28,6 +28,8 @@ Full Stack Developer Hello, I am Dennis Planting. I am 16 years old and from Sweden. I am a programmer and a server administrator. I have knowledge of multiple languages ranging from simpler languages like LUA and JavaScript up to languages like C++, Java and so on. I enjoy anything related to technology like coding, gaming, hardware hacking, etc. I can't call my self an expert in most areas, but I am fairly well rounded in everything, so my main role will be helping in multiple areas as well as helping where others know less. +(Dennis may or may not be a unicorn.) + #Our Combined Skillset HTML5, From 71fa9dfb43e8f1e9f3ac5d6e678b728844764bbf Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Wed, 3 Dec 2014 09:54:33 +0800 Subject: [PATCH 14/17] Updated ABOUT.md + /pegasus --- Teams/0aTempTeam/ABOUT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/0aTempTeam/ABOUT.md index ca94dda..9e83a56 100644 --- a/Teams/0aTempTeam/ABOUT.md +++ b/Teams/0aTempTeam/ABOUT.md @@ -28,7 +28,7 @@ Full Stack Developer Hello, I am Dennis Planting. I am 16 years old and from Sweden. I am a programmer and a server administrator. I have knowledge of multiple languages ranging from simpler languages like LUA and JavaScript up to languages like C++, Java and so on. I enjoy anything related to technology like coding, gaming, hardware hacking, etc. I can't call my self an expert in most areas, but I am fairly well rounded in everything, so my main role will be helping in multiple areas as well as helping where others know less. -(Dennis may or may not be a unicorn.) +(Dennis may or may not be a unicorn/pegasus.) #Our Combined Skillset From a89a93c6a895103c5992a7430b0f667eb7febabd Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Wed, 3 Dec 2014 18:54:14 +0800 Subject: [PATCH 15/17] Moved to /Synergy/ --- Teams/{0aTempTeam => Synergy}/ABOUT.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Teams/{0aTempTeam => Synergy}/ABOUT.md (100%) diff --git a/Teams/0aTempTeam/ABOUT.md b/Teams/Synergy/ABOUT.md similarity index 100% rename from Teams/0aTempTeam/ABOUT.md rename to Teams/Synergy/ABOUT.md From f5aa322aee3258f5d381ff0fc66a916b037f0d35 Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Wed, 3 Dec 2014 18:54:54 +0800 Subject: [PATCH 16/17] Moved to /Synergy/ --- Teams/{0aTempTeam => Synergy}/team.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Teams/{0aTempTeam => Synergy}/team.json (100%) diff --git a/Teams/0aTempTeam/team.json b/Teams/Synergy/team.json similarity index 100% rename from Teams/0aTempTeam/team.json rename to Teams/Synergy/team.json From c17f3458f97c45e39ee76808f0bd88586fda0bef Mon Sep 17 00:00:00 2001 From: "Michael L." Date: Wed, 3 Dec 2014 23:14:59 +0800 Subject: [PATCH 17/17] Updated team.json + Fixed JSON --- Teams/Synergy/team.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/Synergy/team.json b/Teams/Synergy/team.json index e9c02bf..1f596eb 100644 --- a/Teams/Synergy/team.json +++ b/Teams/Synergy/team.json @@ -5,7 +5,7 @@ "name": "Michael Leng", "twitter": "Michael_Leng", "koding": "xsynergi", - "location": "Shanghai, CN" + "location": "Shanghai, CN", "lead": true }, {