Merge branch 'local_changes'
Merge branch 'local_changes'

file:b/.gitattributes (new)
--- /dev/null
+++ b/.gitattributes
@@ -1,1 +1,15 @@
+* text=auto
+* eol=lf
 
+# These files are text and should be normalized (convert crlf => lf)
+*.cs      text diff=csharp
+*.cpp     text diff=cpp
+*.hpp     text diff=cpp
+*.cfg     text
+*.csproj  text eol=crlf
+*.sln     text eol=crlf
+
+# Images should be treated as binary
+# (binary is a macro for -text -diff)
+*.png     binary
+