diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..5c429c57b
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,18 @@
+# EditorConfig is awesome:http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.sh]
+indent_size = 4
+
+[*.json]
+indent_size = 2
+
+[*.css]
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..e945df9c7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text eol=lf
+
+# Ensure shell scripts use LF line endings (linux only accepts LF)
+*.sh eol=lf