Initial commit
.vimrc
New vimrc
Added .editorconfig
Added .gitconfig
Added charset
Moved to root folder
Merge branch 'master' of github.com:andersli/config
Error in merge