ok
Merge branch 'master' of https://github.com/KeizoBookman/vimrc_mine

Conflicts:
	vimrc

        ok