diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..6dfc420d1
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# Top-most EditorConfig file
+root = true
+
+# defaults for all files
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Markdown files uses two trailing spaces to indicate a <br>
+[*.{md,snap}]
+trim_trailing_whitespace = false
diff --git a/src/constants/Platforms.js b/src/constants/Platforms.js
index bd1218169..7b282d834 100644
--- a/src/constants/Platforms.js
+++ b/src/constants/Platforms.js
@@ -140,4 +140,4 @@ const Platforms = {
   },
 };
 
-export default Platforms;
\ No newline at end of file
+export default Platforms;
diff --git a/test/expected/merged b/test/expected/merged
index e1c195c21..1539b2c8e 100755
--- a/test/expected/merged
+++ b/test/expected/merged
@@ -1 +1 @@
-imagefilejsfile
\ No newline at end of file
+imagefilejsfile
diff --git a/test/fixtures/nwapp/images/imagefile.img b/test/fixtures/nwapp/images/imagefile.img
index af7e6cba0..b17c65eb8 100644
--- a/test/fixtures/nwapp/images/imagefile.img
+++ b/test/fixtures/nwapp/images/imagefile.img
@@ -1 +1 @@
-imagefile
\ No newline at end of file
+imagefile