ADD: gitconfig
Merge branch 'master' of https://github.com/huangchanghu/config

Conflicts:
	gitconfig
Merge branch 'master' of https://github.com/huangchanghu/config

Conflicts:
	gitconfig