Current git config
Merge branch 'master' of https://github.com/hkage/dotfiles

Conflicts:
	git/gitconfig