Merging in latest changes from master.

1 files changed, 13 insertions, 0 deletions

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..59406405
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+# http://editorconfig.org
+# See coding conventions in CONTRIBUTING.md
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+
+[*.py]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true