Merge remote branch 'origin/master'
Merge branch 'master' of github.com:rkadeFR/dotvim

Conflicts:
	vimrc

	modified:   vimrc