* converted tabs to spaces
Merge branch 'master' of https://github.com/jheddings/git.conf

Conflicts:
	gitconfig