Merge pull request #3 from pinguo-baiziying/master

baiziying change this again
lihai
Merge branch 'master' of https://github.com/pinguo-lihai/lession1
lihai
lihai
by lihai Merge https://github.com/pinguo-baiziying/lession1 into baiziying-master

Conflicts:
	lession.txt