Updated git config file
Merge branch 'master' of github.com:kazjote/dotifiles

Conflicts:
	.gitconfig