first commit
Merge code.csdn.net:sdjcw/test

Conflicts:
	README.md