merged

.gitignore

@@ -15,4 +15,5 @@
 /tmp
 .elasticbeanstalk/
 
+# Ignore Mac folder settings
 .DS_Store

.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