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

Conflicts:
	gitconfig