Merge branch 'master' of https://github.com/lz1988/test into do

Conflicts:
	do.txt
Merge branch 'master' of https://github.com/lz1988/test into do

Conflicts:
	do.txt