Update home/gitconfig
Merge branch 'master' of github.com:Sannis/dotfiles

Conflicts:
	home/gitconfig