diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..740e840
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,15 @@
+*.[hc]  text
+*.json  text
+*.xml   text
+*.py    text
+*.md    text
+*.txt   text
+*.lua   text
+*.bat   text
+
+# Shell scripts should *always* be LF, regardless of platfrom
+s/*     text eol=lf
+*.sh    text eol=lf
+
+# All third-party code should not be EOL-normalized
+#third-party/**  -text
diff --git a/.gitignore b/.gitignore
index 1dd44ef..9800967 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-*~
+*~
 
 config
+bin