From 3b7038656f81550c659ad437d8333a41fc05e565 Mon Sep 17 00:00:00 2001
From: Cameron Condry <ccondry2@gmail.com>
Date: Tue, 25 Nov 2014 16:50:05 -0500
Subject: [PATCH 1/5] Create team.json

---
 Teams/Bad-Aces/team.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Teams/Bad-Aces/team.json

diff --git a/Teams/Bad-Aces/team.json b/Teams/Bad-Aces/team.json
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/Teams/Bad-Aces/team.json
@@ -0,0 +1 @@
+

From 0933f99d08bad70d9ca3f65ac6f8cd846fafd69a Mon Sep 17 00:00:00 2001
From: Cameron Condry <ccondry2@gmail.com>
Date: Tue, 25 Nov 2014 16:50:33 -0500
Subject: [PATCH 2/5] Create ABOUT.md

---
 Teams/Bad-Aces/ABOUT.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Teams/Bad-Aces/ABOUT.md

diff --git a/Teams/Bad-Aces/ABOUT.md b/Teams/Bad-Aces/ABOUT.md
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/Teams/Bad-Aces/ABOUT.md
@@ -0,0 +1 @@
+

From 52d6be96087e1b7ec30bf4539e1ad396676769de Mon Sep 17 00:00:00 2001
From: Cameron Condry <ccondry2@gmail.com>
Date: Tue, 25 Nov 2014 16:58:55 -0500
Subject: [PATCH 3/5] updated team members

---
 Teams/Bad-Aces/team.json | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/Teams/Bad-Aces/team.json b/Teams/Bad-Aces/team.json
index 8b13789..369c9bb 100644
--- a/Teams/Bad-Aces/team.json
+++ b/Teams/Bad-Aces/team.json
@@ -1 +1,30 @@
-
+{
+    "teamName": "Bad Aces",
+    "members": [
+        {
+            "name": "Aime Menendez",
+            "twitter": "",
+            "koding": "aimemp",
+            "location": "Fort Lauderdale, FL"
+        },
+        {
+            "name": "Cameron Condry",
+            "twitter": "ccondry2",
+            "koding": "ccondry",
+            "location": "Seymour, US",
+            "lead": true
+        },
+        {
+            "name": "Estel Smith",
+            "twitter": "estelsmith",
+            "koding": "estelsmith",
+            "location": "North Vernon, US"
+        },
+        {
+            "name": "Stefan Gimmillaro",
+            "twitter": "sgimmillaro",
+            "koding": "sgimmillaro",
+            "location": "San Francisco, US"
+        }
+    ]
+}

From 7086a3f9fb189c541d480f7f135a997ba262f056 Mon Sep 17 00:00:00 2001
From: Cameron Condry <ccondry2@gmail.com>
Date: Tue, 25 Nov 2014 17:03:12 -0500
Subject: [PATCH 4/5] added default boilerplate for about.md

---
 Teams/Bad-Aces/ABOUT.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Teams/Bad-Aces/ABOUT.md b/Teams/Bad-Aces/ABOUT.md
index 8b13789..a564626 100644
--- a/Teams/Bad-Aces/ABOUT.md
+++ b/Teams/Bad-Aces/ABOUT.md
@@ -1 +1,25 @@
 
+Introduction
+================
+
+We are the Koding team, so we are not really participating. But this page is here
+to give you an idea about your own page.
+
+
+About Team Bad Aces
+===========================
+
+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.
+
+
+How we are getting to the moon...
+=======
+
+Don't reveal too much about your project, this is a competition but maybe
+you can tell us the technologies, APIs you are going to use and what kind
+of application you are going to build.
+
+You can change your mind, that's ok. Just push an update here when you do.

From 9a9ce6426994575aba9289f09eddb1ab6ca49da4 Mon Sep 17 00:00:00 2001
From: Cameron Condry <ccondry2@gmail.com>
Date: Tue, 25 Nov 2014 17:09:33 -0500
Subject: [PATCH 5/5] corrected location format

---
 Teams/Bad-Aces/team.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Teams/Bad-Aces/team.json b/Teams/Bad-Aces/team.json
index 369c9bb..9f0ae04 100644
--- a/Teams/Bad-Aces/team.json
+++ b/Teams/Bad-Aces/team.json
@@ -5,7 +5,7 @@
             "name": "Aime Menendez",
             "twitter": "",
             "koding": "aimemp",
-            "location": "Fort Lauderdale, FL"
+            "location": "Fort Lauderdale, US"
         },
         {
             "name": "Cameron Condry",