diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..17e32163f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 140
+tab_width = 4
+trim_trailing_whitespace = true
+
+[{*.markdown,*.md}]
+trim_trailing_whitespace = false
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index f7b396404..955e1c488 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.iml
 .idea
 .gradle
+.kotlin
 local.properties
 .DS_Store
 Gemfile
@@ -8,5 +9,6 @@ build
 app/build
 app/release
 app/.cxx
+app/.attach_*
 fastlane/Appfile
 tools/*.txt