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

Conflicts:
	lession.txt
Merge remote-tracking branch 'hehl/master'

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

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

Conflicts:
	lession.txt
Merge branch 'master' of https://github.com/pinguo-hehailin/lession1

Conflicts:
	lession.txt
fix conflits
Merge pull request #30 from pinguo-hehailin/master

add line hehl