Update .gitconfig
Conflicts:
	.gitconfig