diff --git a/.DS_Store b/.DS_Store
deleted file mode 100755
index 64140ef..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
index 5edf630..4fc6b30 100755
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@
 /log/*.log
 /tmp
 .elasticbeanstalk/
+
+# Ignore Mac folder settings
+.DS_Store
diff --git a/app/.DS_Store b/app/.DS_Store
deleted file mode 100755
index 61ed6c5..0000000
Binary files a/app/.DS_Store and /dev/null differ
diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store
deleted file mode 100755
index ce2e600..0000000
Binary files a/app/assets/.DS_Store and /dev/null differ
diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store
deleted file mode 100755
index 488834e..0000000
Binary files a/app/assets/images/.DS_Store and /dev/null differ
diff --git a/app/assets/images/fonts/.DS_Store b/app/assets/images/fonts/.DS_Store
deleted file mode 100755
index 9f18abb..0000000
Binary files a/app/assets/images/fonts/.DS_Store and /dev/null differ
diff --git a/app/assets/javascripts/.DS_Store b/app/assets/javascripts/.DS_Store
deleted file mode 100755
index 2a579a9..0000000
Binary files a/app/assets/javascripts/.DS_Store and /dev/null differ
diff --git a/app/assets/stylesheets/.DS_Store b/app/assets/stylesheets/.DS_Store
deleted file mode 100755
index 2ab8b82..0000000
Binary files a/app/assets/stylesheets/.DS_Store and /dev/null differ