From e7f805fe0c74234d18cca420b92ede500c70c860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Torres?= <elfotografo007@gmail.com>
Date: Wed, 26 Nov 2014 16:45:52 -0500
Subject: [PATCH 1/3] Create team.json

---
 Teams/Shamas/team.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 Teams/Shamas/team.json

diff --git a/Teams/Shamas/team.json b/Teams/Shamas/team.json
new file mode 100644
index 0000000..8212359
--- /dev/null
+++ b/Teams/Shamas/team.json
@@ -0,0 +1,24 @@
+{
+  "teamName": "Shamas",
+  "members": [
+    {
+      "name": "Andrés Torres",
+      "twitter": "elfotografo007",
+      "koding": "elfotografo007",
+      "location": "Pereira, CO",
+      "lead": true
+    },
+    {
+      "name": "Harold Sánchez",
+      "twitter": "sancospi",
+      "koding": "sancospi",
+      "location": "Pereira, CO"
+    },
+    {
+      "name": "Mariano Aguirre",
+      "twitter": "sinanyasar",
+      "koding": "sinan",
+      "location": "Medellin, CO"
+    }
+  ]
+}

From bd00166c724c7efe1d63a93b3d4807ffd1204448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Torres?= <elfotografo007@gmail.com>
Date: Wed, 26 Nov 2014 16:53:01 -0500
Subject: [PATCH 2/3] Create ABOUT.md

---
 Teams/Shamas/ABOUT.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 Teams/Shamas/ABOUT.md

diff --git a/Teams/Shamas/ABOUT.md b/Teams/Shamas/ABOUT.md
new file mode 100644
index 0000000..16deef8
--- /dev/null
+++ b/Teams/Shamas/ABOUT.md
@@ -0,0 +1,8 @@
+Shamas
+================
+
+We are a team of three developers from Colombia.
+
+This is our first hackaton and we hope to create something awesome.
+
+We use Ruby On Rails, MongoDB, Javascript and AngularJS

From 6705c388e3e2fe83c236a5057a5eb1a947e51be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Torres?= <elfotografo007@gmail.com>
Date: Fri, 28 Nov 2014 13:45:16 -0500
Subject: [PATCH 3/3] =?UTF-8?q?Se=20agrega=20informaci=C3=B3n=20de=20Maria?=
 =?UTF-8?q?no.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Teams/Shamas/team.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Teams/Shamas/team.json b/Teams/Shamas/team.json
index 8212359..9e750fc 100644
--- a/Teams/Shamas/team.json
+++ b/Teams/Shamas/team.json
@@ -16,8 +16,8 @@
     },
     {
       "name": "Mariano Aguirre",
-      "twitter": "sinanyasar",
-      "koding": "sinan",
+      "twitter": "nano_mag",
+      "koding": "nanomag",
       "location": "Medellin, CO"
     }
   ]