new vimrc
Merge branch 'master' of https://github.com/AlloVince/vim-of-allovince

Conflicts:
	README.md