Filling out gitconfig

Conflicts:
	.gitconfig