Latest gitconfig
Merge
Merge branch 'master' of github.com:emiel/dotfiles

Conflicts:
	git/gitconfig