From 34af24d61755abf87f480cced13e32cbd7dafe7c Mon Sep 17 00:00:00 2001
From: Cort Buffington <n0mjs@me.com>
Date: Fri, 28 Jun 2013 20:28:25 -0500
Subject: [PATCH] Merge branch 'master' of https://github.com/n0mjs710/IPSC

Conflicts:
	.gitignore
---
 .gitignore | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 496ee2c..57ff146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
-.DS_Store
\ No newline at end of file
+.DS_Store
+.dropbox
+<<<<<<< HEAD
+Icon
+=======
+Icon
+>>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389