Git three-way merging
Merge branch 'master' of github.com:enthrops/dotfiles

Conflicts:
	gitconfig
	zshenv