diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..d56abbf30
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto eol=lf
diff --git a/.gitignore b/.gitignore
index 481e82b6c..3ef1f7a03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,5 +36,4 @@ student-work/
 .idea/
 .byebug_history
 coverage/
-.vscode
 _history
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..7e6882bfa
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "files.eol": "\n"
+}