Merge pull request #876 from blackdev1l/master

Team MAACC
2014-12-03 12:14:10 -08:00
parent 4cc03a9309 807df98b7a
commit 6a38cb8345
2 changed files with 44 additions and 0 deletions
@@ -0,0 +1,8 @@
+Team MAACC is
+===========================
+WIP
+
+
+Our project is about
+===========================
+WIP
@@ -0,0 +1,36 @@
+{
+  "teamName": "Team MAACC",
+  "members": [
+    {
+      "name": "Cristian Achille",
+      "twitter": "_blackdev1l",
+      "koding": "blackdev1l",
+      "location": "Modena, IT",
+      "lead": true
+    },
+    {
+      "name": "Michael Rickert",
+      "twitter": "ccnppro",
+      "koding": "slacker87",
+      "location": "Princeton, US"
+    },
+    {
+      "name": "alex taylor",
+      "twitter": "null",
+      "koding": "atat",
+      "location": "London, UK"
+    },
+    {
+      "name": "Austin Lazarus",
+      "twitter": "aulavara",
+      "koding": "Aulavara",
+      "location": "Dominica, WI"
+    },
+    {
+      "name": "Cameron Craig",
+      "twitter": "nomnomcameron",
+      "koding": "nomnomcameron",
+      "location": "Phoenix, AZ"
+    }
+  ]
+}