diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..fbd15db
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,28 @@
+# 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.
+
+*.c text
+*.h text
+*.cpp text
+*.hpp text
+*.cbp text
+*.txt text
+*.vert text
+*.frag text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+
+*.bmp binary
+*.png binary
+*.jpg binary
+*.dll binary
+*.so binary
+*.a binary
+*.exe
+*.o
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 9fa3b1b..20527d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,37 @@
-# Object files
+Thumbs.db
+.fuse_hidden*
+*~
+*#
+#*#
+*.out
 *.o
-*.ko
-
-# Libraries
-*.lib
-*.a
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
+.directory
+*.cbp
+*.layout*
+*.layout
+*.depend*
+*.depend
 *.exe
-*.out
-*.app
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.sln.docstates
+*.tlb
+*.tlh
+*.bak
+*.cache
+*.ilk
+*.log
+[Bb]in
+[Dd]ebug*/
+*.sbr
+obj/
+[Rr]elease*/
+_ReSharper*/
+[Tt]est[Rr]esult*
\ No newline at end of file