From f9bdc7e5e72dd47044d964586f05b8aec57149d5 Mon Sep 17 00:00:00 2001 From: awm4j Date: Thu, 27 Nov 2014 02:02:52 -0500 Subject: [PATCH 1/5] updating team info --- Teams/Asiph/ABOUT.md | 24 ++++++++++++++++++++++++ Teams/Asiph/team.json | 24 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 Teams/Asiph/ABOUT.md create mode 100644 Teams/Asiph/team.json diff --git a/Teams/Asiph/ABOUT.md b/Teams/Asiph/ABOUT.md new file mode 100644 index 0000000..d9cc3ec --- /dev/null +++ b/Teams/Asiph/ABOUT.md @@ -0,0 +1,24 @@ +About Team Asiph +=========================== + +| awm4j |sippy | hagan +|--- |--- |--- +| ![awm4j](http://graph.facebook.com/awm4j/picture) | ![sippy](http://graph.facebook.com/Sippyy/picture) | ![hagan](http://graph.facebook.com/nate.hagan/picture) | + +/// In the process of writing this up +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. +Tell us why you want to win. +/// end writing up process + +Skills +======= +HTML, CSS, JS, PHP, C++, C#, .NET, Python, MySQL + + +Project Idea +======= +We are not completely sure what we are doing exactly. +We will take advantage of Facebook, Twitter, Google+, and Skype to perform team communications. +We will be using several APIs and applications to complete our task. \ No newline at end of file diff --git a/Teams/Asiph/team.json b/Teams/Asiph/team.json new file mode 100644 index 0000000..aedf216 --- /dev/null +++ b/Teams/Asiph/team.json @@ -0,0 +1,24 @@ +{ + "teamName": "Asiph", + "members": [ + { + "name": "Matt McGee", + "twitter": "awm4j", + "koding": "awm4j", + "location": "York, PA", + "lead": true + }, + { + "name": "Christian Dehli", + "twitter": "cpdehli", + "koding": "sippy", + "location": "Pittsburgh, PA" + }, + { + "name": "Nate Hagan", + "twitter": "", + "koding": "", + "location": "Seattle, WA" + } + ] +} From 0c5ae08d9554fb0fbaa85e2b90f82206b402b46d Mon Sep 17 00:00:00 2001 From: awm4j Date: Thu, 27 Nov 2014 02:18:07 -0500 Subject: [PATCH 2/5] updated about.md to have larger images --- Teams/Asiph/ABOUT.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Teams/Asiph/ABOUT.md b/Teams/Asiph/ABOUT.md index d9cc3ec..4d6e57b 100644 --- a/Teams/Asiph/ABOUT.md +++ b/Teams/Asiph/ABOUT.md @@ -3,13 +3,15 @@ About Team Asiph | awm4j |sippy | hagan |--- |--- |--- -| ![awm4j](http://graph.facebook.com/awm4j/picture) | ![sippy](http://graph.facebook.com/Sippyy/picture) | ![hagan](http://graph.facebook.com/nate.hagan/picture) | +| ![awm4j](http://graph.facebook.com/awm4j/picture?type=large) | ![sippy](http://graph.facebook.com/Sippyy/picture?type=large) | ![hagan](http://graph.facebook.com/nate.hagan/picture?type=large) | /// In the process of writing this up + 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. Tell us why you want to win. + /// end writing up process Skills From 5e78838f9f812bfc4bad7e762553b358acb4fd16 Mon Sep 17 00:00:00 2001 From: awm4j Date: Thu, 27 Nov 2014 14:49:48 -0500 Subject: [PATCH 3/5] added Hagan's Koding account --- Teams/Asiph/team.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Teams/Asiph/team.json b/Teams/Asiph/team.json index aedf216..581c818 100644 --- a/Teams/Asiph/team.json +++ b/Teams/Asiph/team.json @@ -16,8 +16,8 @@ }, { "name": "Nate Hagan", - "twitter": "", - "koding": "", + "twitter": "terminatur1", + "koding": "terminatur", "location": "Seattle, WA" } ] From 40a8255177931d4d62433e1693540182915e9e99 Mon Sep 17 00:00:00 2001 From: awm4j Date: Thu, 27 Nov 2014 18:35:36 -0500 Subject: [PATCH 4/5] changed state to country code --- Teams/Asiph/team.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Teams/Asiph/team.json b/Teams/Asiph/team.json index 581c818..5f97796 100644 --- a/Teams/Asiph/team.json +++ b/Teams/Asiph/team.json @@ -5,20 +5,20 @@ "name": "Matt McGee", "twitter": "awm4j", "koding": "awm4j", - "location": "York, PA", + "location": "York, US", "lead": true }, { "name": "Christian Dehli", "twitter": "cpdehli", "koding": "sippy", - "location": "Pittsburgh, PA" + "location": "Pittsburgh, US" }, { "name": "Nate Hagan", "twitter": "terminatur1", "koding": "terminatur", - "location": "Seattle, WA" + "location": "Seattle, US" } ] } From a09ee04500de0417e3009ff038ed162ff7d0d615 Mon Sep 17 00:00:00 2001 From: awm4j Date: Thu, 27 Nov 2014 19:08:33 -0500 Subject: [PATCH 5/5] updated about page --- Teams/Asiph/ABOUT.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Teams/Asiph/ABOUT.md b/Teams/Asiph/ABOUT.md index 4d6e57b..18f281d 100644 --- a/Teams/Asiph/ABOUT.md +++ b/Teams/Asiph/ABOUT.md @@ -5,14 +5,9 @@ About Team Asiph |--- |--- |--- | ![awm4j](http://graph.facebook.com/awm4j/picture?type=large) | ![sippy](http://graph.facebook.com/Sippyy/picture?type=large) | ![hagan](http://graph.facebook.com/nate.hagan/picture?type=large) | -/// In the process of writing this up +We are a group of problem solving Grove City College alumni who enjoy building cool and interactive solutions. +We saw this hackathon as a good way to catch up and build something awesome together. -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. -Tell us why you want to win. - -/// end writing up process Skills =======