diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..69f4250b
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+trim_trailing_whitespace = true
+insert_final_newline = false
+
+[*.java]
+indent_style=tab
+tab_width=4
+
+[*.rb]
+indent_style=space
+indent_size=2
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index f14d3537..ebfa5837 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
+.*
+
 !.gitignore
 !.rubocop.yml
+!.editorconfig
 
-.*
 *~
 *.class
 *.iml
@@ -10,3 +12,4 @@
 /data/savedGames
 /lib/
 */target/
+