Fixed gitconfig
Merge branch 'master' of github.com:n1ck3/dotfiles-local

Conflicts:
	git/gitconfig