diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..19fa4f2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,11 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted to native line endings on checkout.
+*.md text
+*.info text
+*.txt text
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
diff --git a/.gitignore b/.gitignore
index 8eef75c..fcca8b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,19 @@
-build/
-.classpath
-.project
-.gradle/
-eclipse/
+# Ignore Gradle cache files & directories
 bin/
-repo/
-/run/
+build/
+## Eclipse
+eclipse/
+.classpath
+.gradle/
+.project
 .settings/
-#IDEA files from Gradle
-.idea/
+## Idea
+.idea
 /*.iml
 /*.ipr
 /*.iws
+
+# Ignore OS cache files & directories
+*.DS_Store
+_MACOSX
+Thumbs.db