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
diff --git a/Teams/Shamas/team.json b/Teams/Shamas/team.json
new file mode 100644
index 0000000..9e750fc
--- /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": "nano_mag",
+      "koding": "nanomag",
+      "location": "Medellin, CO"
+    }
+  ]
+}