From e4ae169391db51fbf7135b24bfe038ea57595616 Mon Sep 17 00:00:00 2001
From: jebes <psteidelprogramming@gmail.com>
Date: Sun, 23 Nov 2014 14:29:17 -0500
Subject: [PATCH 1/3] 3dpg team added

---
 Teams/3DPG/ABOUT.md  | 43 +++++++++++++++++++++++++++++++++++++++++++
 Teams/3DPG/team.json | 12 ++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 Teams/3DPG/ABOUT.md
 create mode 100644 Teams/3DPG/team.json

diff --git a/Teams/3DPG/ABOUT.md b/Teams/3DPG/ABOUT.md
new file mode 100644
index 0000000..6651bbf
--- /dev/null
+++ b/Teams/3DPG/ABOUT.md
@@ -0,0 +1,43 @@
+3DPG
+====
+
+A single man team with a passion for low level hackery
+
+About 3DPG
+----------
+
+| Peter Steidel       |
+|---------------------|
+| Picture Unavailable |
+
+Description currently being written
+
+Skills
+------
+Programming languages (that may be used):
+	- Assembly
+	- C
+	- Lisp
+	- HTML/CSS and JS
+
+Project
+-------
+
+The goal of my project is to show how simplicity and composability can
+be used to create extensible, scalable, flexible, small, and fast
+software. This corresponds to theme 2 for the hackathon, and there,
+maybe, will be a game ^^.
+
+	
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Teams/3DPG/team.json b/Teams/3DPG/team.json
new file mode 100644
index 0000000..9d5c72d
--- /dev/null
+++ b/Teams/3DPG/team.json
@@ -0,0 +1,12 @@
+{
+    "teamName": "3DPG",
+    "members": [
+	{
+	    "name": "Peter Steidel",
+	    "twitter": "ifthenfi",
+	    "koding": "korbo",
+	    "location": "Roanoke, VA"
+	    "lead": true
+	}
+    ]
+}

From b477d2922cb1428394f6b8e5e862d987fd64f782 Mon Sep 17 00:00:00 2001
From: jebes nyaa <flamingnoms@gmail.com>
Date: Sun, 23 Nov 2014 15:43:12 -0500
Subject: [PATCH 2/3] Update team.json

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

diff --git a/Teams/3DPG/team.json b/Teams/3DPG/team.json
index 9d5c72d..5eb82e8 100644
--- a/Teams/3DPG/team.json
+++ b/Teams/3DPG/team.json
@@ -5,7 +5,7 @@
 	    "name": "Peter Steidel",
 	    "twitter": "ifthenfi",
 	    "koding": "korbo",
-	    "location": "Roanoke, VA"
+	    "location": "Roanoke, US"
 	    "lead": true
 	}
     ]

From 937fbb81b5e11a45d137842e09cae91f0ebbb456 Mon Sep 17 00:00:00 2001
From: jebes nyaa <flamingnoms@gmail.com>
Date: Sun, 23 Nov 2014 15:44:02 -0500
Subject: [PATCH 3/3] Update ABOUT.md

Shoulda ran M-x whitespace cleanup
---
 Teams/3DPG/ABOUT.md | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/Teams/3DPG/ABOUT.md b/Teams/3DPG/ABOUT.md
index 6651bbf..e2cfd72 100644
--- a/Teams/3DPG/ABOUT.md
+++ b/Teams/3DPG/ABOUT.md
@@ -27,17 +27,3 @@ The goal of my project is to show how simplicity and composability can
 be used to create extensible, scalable, flexible, small, and fast
 software. This corresponds to theme 2 for the hackathon, and there,
 maybe, will be a game ^^.
-
-	
-
-
-
-
-
-
-
-
-
-
-
-