commit!
commit!
commit!
commit!
commit!
Merge branch 'master' into minimum

Conflicts:
	_gvimrc
	_vimrc
	dotFilesLink.bat
commit!!
commit!