Update global .gitconfig
Merge

Conflicts:
	gitconfig
Merge branch 'master' of github.com:eriklindebratt/work-env

Conflicts:
	gitconfig