diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..f45f5029
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,13 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Files that will always have UNIX line-endings LF rather than Windows-style CRLF.
+*.css text eol=lf
+*.js text eol=lf
+*.md text eol=lf
+*.svg text eol=lf
+*.xml text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+# (binary is a macro for -text -diff)
+*.png binary
diff --git a/.gitignore b/.gitignore
index 2ccbe465..676474e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,9 @@
+# OS files #
+._*
+.DS_Store
+.Spotlight-V100
+.Trashes
+Thumbs.db
+
+# Other files #
 /node_modules/