add "add new line 1111"
Merge remote-tracking branch 'lhw/master'

Conflicts:
	lession.txt
Merge pull request #25 from pinguo-fenghaiting/master

冲突已解决

well done
Merge remote-tracking branch 'hehl/master'

Conflicts:
	lession.txt
21:02 add tag
Merge pull request #3 from pinguo-liaofeng/master

liaofeng 21:04
tes
Merge remote-tracking branch 'lhw/master'

Conflicts:
	lession.txt
Merge pull request #2 from pinguo-zhangzhi/master

tes
well done
add tanglei 21:10
test 21:11
Merge branch 'master' of https://github.com/pinguo-tanglei/lession1
Merge branch 'master' of https://github.com/pinguo-hehailin/lession1

Conflicts:
	lession.txt
Merge pull request #29 from pinguo-tanglei/master

tag
fix conflits
Merge pull request #30 from pinguo-hehailin/master

add line hehl
commit
test
pass