gitconfig update
Merge branch 'master' of https://github.com/spezifanta/dotfiles

Conflicts:
	.gitconfig