Fixed README merge

LICENSE

@@ -0,0 +1,8 @@
+MIT License
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,19 +1,3 @@
-# My Neovim Config
+# neovim-config
-## Intro
-Neovim, the popular fork of the original Vim, has been my main text editor for a few months. Over this time, I've made
-lots of changes to the config. The goal of this repository is to be an advanced config that's still very much readable.
-I've commented as much as I can, and I try to explain as many vague/difficult settings as possible.
 
-## Goals
+My full Neovim setup.
-When I started to config my Neovim, I had a few goals in mind:
-- Only use key bindings that use buttons available on any keyboard:
-    - letter keys
-    - spacebar
-    - backspace
-- Make the config work the same on QWERTY and AZERTY (French keyboard layout)
-- Leave the homerow as little as possible (no uncomfortable stretching)
-- Make it ready for any language that I need to write for college and/or personal projects.
-
-## Design
-I like to split my configs up into multiple files, as you can see in this repository. It makes it easier for me to
-navigate, and it makes it so I don't just have a file that's a thousand lines long.