commit by baiziying
baiziying Merge remote-tracking branch 'lihai/master'

Conflicts:
	lession.txt
Merge pull request #3 from pinguo-baiziying/master

baiziying change this again