添加了～/.gitconfig文件
Merge branch 'master' of https://github.com/hicqu/configure

Conflicts:
	README.md