Added to gitconfig
Merge branch 'master' of https://github.com/zakvdm/ZakConfig

Conflicts:
	gitconfig