更新 .gitconifg 和 .zshrc
Merge branch 'master' of https://github.com/stepinto/conf

Conflicts:
	.zshrc