Create line 1 by hehailin
hello, liaofeng
first file
Merge remote-tracking branch 'hehailin/master'

Conflicts:
	lession.txt
Create lession.txt
lihai
by lihai
Merge remote-tracking branch 'liuhongwei/master'
Merge remote-tracking branch 'lhw/master'

Conflicts:
	lession.txt
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
lihai
Merge branch 'master' of https://github.com/pinguo-lihai/lession1
add new line
lihai
Merge pull request #1 from pinguo-shenqiang/master

add new line
Merge pull request #16 from pinguo-lihai/master

lihai second
well done
Merge remote-tracking branch 'hehl/master'

Conflicts:
	lession.txt
yangbing edit
work on conflicts