add .gitconfig
Merge branch 'master' of github.com:guoxiao/dotfiles

Conflicts:
	.gitconfig