冲突测试
Merge branch 'master' of https://github.com/woodworking/HelloGitHub

Conflicts:
	assets/open.TXT
Merge branch 'master' of https://github.com/woodworking/HelloGitHub