xxx
Merge branch 'master' of https://github.com/danaans135/dotfiles

Conflicts:
	_gvimrc
	_vimrc