first commit
second commit
Merge code.csdn.net:lancehqm/testproject

Conflicts:
	README.md