shitty git
Merge branch 'master' of https://github.com/Lexx666/.vim

Conflicts:
	.netrwhist
	.vimrc