diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..8965ca77
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,24 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,go}]
+charset = utf-8
+
+# 4 space indentation
+[*.go]
+indent_style = space
+indent_size = 2
+
+# Indentation override for all JS under lib directory
+[*.js]
+indent_style = space
+indent_size = 2