diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..a6ce0d78a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_size = 1
+indent_style = space
+trim_trailing_whitespace = true
+max_line_length = 100
+
+[*.js]
+indent_size = 2
+
+[.travis.yml]
+indent_size = 2
+
+[deploy.sh]
+indent_size = 4
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..176a458f9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto