work
Merge branch 'master' of https://github.com/carlzhangxuan/git_in_China

Conflicts:
	note
work!