自述文件初稿
Merge remote-tracking branch 'origin/master' into register

Conflicts:
	README.md