冲突已解决
Update lession.txt
add new item
add new item
Merge pull request #6 from pinguo-majianguang/master

add new item pass
test
Merge remote-tracking branch 'lhw/master'
pass
Merge remote-tracking branch 'lhw/master'
ss
add one line 21:44
Merge remote-tracking branch 'hehl/master'

Conflicts:
	lession.txt
Merge pull request #6 from pinguo-liaofeng/master

asdd
pass
Merge pull request #36 from pinguo-hehailin/master

hehailin 21:50
Merge pull request #37 from pinguo-fenghaiting/master

pass
no confict