change gitconfig
test
Merge branch 'master' of github.com:blue-emc2/myvimrc

Conflicts:
	.gitconfig