test3
Merge branch 'master' of https://github.com/BibiFock/vim

Conflicts:
	.vimrc