From dc96bf524de692c5d50abfa1a7f99ad456180bf3 Mon Sep 17 00:00:00 2001
From: Ken Johnson <cktricky@Kens-MacBook-Pro.local>
Date: Tue, 4 Jun 2013 16:04:12 -0400
Subject: [PATCH] merged

---
 .gitignore      |  1 +
 .gitignore.orig | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100755 .gitignore.orig

diff --git a/.gitignore b/.gitignore
index 1b0d32d..4fc6b30 100755
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@
 /tmp
 .elasticbeanstalk/
 
+# Ignore Mac folder settings
 .DS_Store
diff --git a/.gitignore.orig b/.gitignore.orig
new file mode 100755
index 0000000..2e2dfde
--- /dev/null
+++ b/.gitignore.orig
@@ -0,0 +1,22 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp
+.elasticbeanstalk/
+
+<<<<<<< HEAD
+=======
+# Ignore Mac folder settings
+>>>>>>> d9f4ac72d59c99ffa009f32b1a51ed5f13ab067f
+.DS_Store