From f46e11fc0a7d8e3bf6f8cf4453e702666647b823 Mon Sep 17 00:00:00 2001
From: P1xt <kjphpdev@gmail.com>
Date: Tue, 2 Dec 2014 14:49:46 -0600
Subject: [PATCH 1/4] Create team.json

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

diff --git a/Teams/Fluffle/team.json b/Teams/Fluffle/team.json
new file mode 100644
index 0000000..714ef64
--- /dev/null
+++ b/Teams/Fluffle/team.json
@@ -0,0 +1,11 @@
+{
+  "teamName": "Fluffle",
+  "members": [
+    {
+      "name": "Kristin Jones",
+      "twitter": "P1xt",
+      "koding": "p1xt",
+      "location": "Minneapolis, US"
+    },
+  ]
+}

From 3e634a653aafca79de9398402efacad1021ba661 Mon Sep 17 00:00:00 2001
From: P1xt <kjphpdev@gmail.com>
Date: Tue, 2 Dec 2014 15:11:02 -0600
Subject: [PATCH 2/4] Create ABOUT.md

Initial commit
---
 Teams/Fluffle/ABOUT.md | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 Teams/Fluffle/ABOUT.md

diff --git a/Teams/Fluffle/ABOUT.md b/Teams/Fluffle/ABOUT.md
new file mode 100644
index 0000000..ecfeeff
--- /dev/null
+++ b/Teams/Fluffle/ABOUT.md
@@ -0,0 +1,35 @@
+Fluffle
+================
+
+Welcome to the Fluffle team page  :)
+
+
+Team Fluffle (single person)
+============================
+
+Hello, my name is Kris and I'm a software engineer from Minneapolis, MN. 
+Most of the work I've done in "the Industry"  has been data related ... 
+data warehousing big data. Though I've worked in a variety of programming
+languages, and have a deep understanding of data, I've rarely had the
+opportunity to really explore front-end work and develop something really
+slick that just begs to be used, clicked, played with.
+
+
+Skills
+=======
+Data: Databases (Oracle, Informix, MySql), ETL: Ab Initio 
+Programming: PHP, Python, Ruby on Rails, C, C++
+
+Plan
+====
+I've not yet picked my challenge, though I'll likely go with the HTML5 games 
+challenge. Working through making a multiplayer, interactive, educational
+experience would be an interestin challenge.
+
+Tools I'd Use
+=============
+Not set in stone but I've been wanting to play with Phaser 2.0, so I'd likely 
+start with that and add as necessary.
+
+
+

From 6d08dea0f4f26e9b9447336f809148e43a1bd38f Mon Sep 17 00:00:00 2001
From: P1xt <kjphpdev@gmail.com>
Date: Tue, 2 Dec 2014 15:11:55 -0600
Subject: [PATCH 3/4] Update ABOUT.md

---
 Teams/Fluffle/ABOUT.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Teams/Fluffle/ABOUT.md b/Teams/Fluffle/ABOUT.md
index ecfeeff..57d3e4f 100644
--- a/Teams/Fluffle/ABOUT.md
+++ b/Teams/Fluffle/ABOUT.md
@@ -18,6 +18,7 @@ slick that just begs to be used, clicked, played with.
 Skills
 =======
 Data: Databases (Oracle, Informix, MySql), ETL: Ab Initio 
+
 Programming: PHP, Python, Ruby on Rails, C, C++
 
 Plan

From d35a18026c6be1519894098c09330035b5ee4c4b Mon Sep 17 00:00:00 2001
From: P1xt <kjphpdev@gmail.com>
Date: Tue, 2 Dec 2014 15:35:37 -0600
Subject: [PATCH 4/4] Update team.json

Removing extraneous comma.
---
 Teams/Fluffle/team.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Teams/Fluffle/team.json b/Teams/Fluffle/team.json
index 714ef64..31da0a1 100644
--- a/Teams/Fluffle/team.json
+++ b/Teams/Fluffle/team.json
@@ -6,6 +6,6 @@
       "twitter": "P1xt",
       "koding": "p1xt",
       "location": "Minneapolis, US"
-    },
+    }
   ]
 }