commit by shenqiang
by liuzhaohui
add zhangjin
yangbing add
lihai add
baiizying add a line
xxx
yangbing edit
Merge pull request #2 from pinguo-zhangjin/master

xxoo
my first commit
a file add by baiziying
add yangbing
resolve conflit with yangbing
resolve conflit with yangbing
by lihai Merge branch 'master' of https://github.com/pinguo-baiziying/lession1 into pinguo-baiziying-master

Conflicts:
	lession.txt
eidt 2
Merge pull request #3 from pinguo-yangbing/master

eidt 2
Merge remote-tracking branch 'source/master'

Conflicts:
	lession.txt
try 2
add a line by baiziying