diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..44013c459
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# EditorConfig is awesome:
+http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use tabs as indentation
+# Trim trailing whitespace
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.cs]
+indent_size = 2
+
+[*.csproj]
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index 247be5e1e..541f90610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ Build/VMWare/Workstation/Cosmos.vmxf
 
 Setup/Current.iss
 Cosmos.Assembler.Log
+UpgradeLog.htm