diff --git a/.editorconfig b/.editorconfig
index dd89059b..27e3ede9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,4 +8,5 @@ root = true
 [*]
 indent_style = tab
 indent_size = 4
+trim_trailing_whitespace = true
 insert_final_newline = true
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..832f967c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,27 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+*.sh -lf
+gradlew -lf
+
+# Sources
+*.c     text diff=c
+*.cc    text diff=cpp
+*.cxx   text diff=cpp
+*.cpp   text diff=cpp
+*.c++   text diff=cpp
+*.hpp   text diff=cpp
+*.h     text diff=c
+*.h++   text diff=cpp
+*.hh    text diff=cpp
+
+# Compiled Object files
+*.o     binary
+*.a     binary
+*.obj   binary
+*.lib   binary
+
+# Project files
+#*.sln     merge=binary
+#*.vcxproj merge=binary