添加一个label
Merge branch 'master' of https://github.com/mandytong002/mandytonggit

Conflicts:
	安装文档.md