run on git version 1.7.10.4
Merge branch 'master' of github.com:if1live/dotfiles

Conflicts:
	git/.gitconfig