From e955eeea8c9abab2279ed842a33dac85b552873d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emina=20=C5=A0ahbegovi=C4=87?= <emina_sahbeg@yahoo.com>
Date: Wed, 26 Nov 2014 12:50:13 +0100
Subject: [PATCH 1/3] Create team.json

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

diff --git a/Teams/conqueredMuffin/team.json b/Teams/conqueredMuffin/team.json
new file mode 100644
index 0000000..adbc65e
--- /dev/null
+++ b/Teams/conqueredMuffin/team.json
@@ -0,0 +1,11 @@
+{
+  "teamName": "conqueredMuffin",
+  "members": [
+    {
+      "name": "Emina Šahbegović",
+      "twitter": "MurakiChiyo",
+      "koding": "leviheichou",
+      "location": "Sarajevo, BH",
+    }
+      ]
+}

From d6a95cf0cb9644ac8dadbb1d3ad7d3e3ca2f2ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emina=20=C5=A0ahbegovi=C4=87?= <emina_sahbeg@yahoo.com>
Date: Wed, 26 Nov 2014 13:37:15 +0100
Subject: [PATCH 2/3] Create ABOUT.md

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

diff --git a/Teams/conqueredMuffin/ABOUT.md b/Teams/conqueredMuffin/ABOUT.md
new file mode 100644
index 0000000..a423e09
--- /dev/null
+++ b/Teams/conqueredMuffin/ABOUT.md
@@ -0,0 +1,20 @@
+<h1><b>This is our page</b></h1>
+
+<em>Well actually it's just me for now. I am from Bosnia and Herzegovina, currently living in Sarajevo.</em>
+
+<h1><b>About your team</b></h1>
+
+<em>My name is Emina Šahbegović, I am twenty-one years old and I am a second year student at International Burch Univercity in 
+Sarajevo, Bosnia. I have decided to try and join the hackaton because I am a curious person and like to take as many 
+opportunities as possible to gather more knowledge when it comes to programming. I have fallen in love with 
+programming and would like to become one of the best programmers in this world, but since I started relatively late compared to 
+my colleagues it will probably take some time till I get there. I would really like to become one of the best programmers for 
+two reasons. First reason would have to be so I can pay my family everything back that they invested in me and finally be 
+independent. The second reason is because I really respect smart people and would love to become a smart person who is needed 
+in society.</em>
+
+<h1><b>Abut your skills and what you are going to do?</b></h1>
+
+<em>Since my skills in coding are still at a beginners level, it's possible that it won't kick people from their chairs but 
+I will try to make the best project I've made yet. I do have some skills ehn it comes to design and art so hopefully it will 
+make up a little for the lack of knowledge in coding. I will try to build a PC game and it will, hopefully, be interesting.</em>

From 1e8cc8c8a7d95eebfd0a9191110ba6f1d8ed0eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emina=20=C5=A0ahbegovi=C4=87?= <emina_sahbeg@yahoo.com>
Date: Wed, 26 Nov 2014 20:36:54 +0100
Subject: [PATCH 3/3] Removed the comma at EOL

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

diff --git a/Teams/conqueredMuffin/team.json b/Teams/conqueredMuffin/team.json
index adbc65e..51de43f 100644
--- a/Teams/conqueredMuffin/team.json
+++ b/Teams/conqueredMuffin/team.json
@@ -5,7 +5,7 @@
       "name": "Emina Šahbegović",
       "twitter": "MurakiChiyo",
       "koding": "leviheichou",
-      "location": "Sarajevo, BH",
+      "location": "Sarajevo, BH"
     }
       ]
 }