baiziying add a line
test
aofeng
test
baiziying Merge branch 'Feature1' of https://github.com/pinguo/lession2 into pinguo

Conflicts:
	lession2.txt
Lines starting
baiziying Merge branch 'Feature1' of https://github.com/pinguo/lession2 into pinguo

Conflicts:
	lession2.txt
test
Merge remote-tracking branch 'lhw2/Feature1' into Feature1

Conflicts:
	lession2.txt
baiziying Merge branch 'Feature1' of https://github.com/pinguo/lession2 into pinguo

Conflicts:
	lession2.txt
Merge remote-tracking branch 'lhw2/Feature1' into Feature1

Conflicts:
	lession2.txt
test
baiziying Merge branch 'Feature1' of https://github.com/pinguo/lession2 into pinguo

Conflicts:
	lession2.txt
Merge remote-tracking branch 'lhw2/Feature1' into Feature1

Conflicts:
	lession2.txt
test
Merge pull request #55 from pinguo-baiziying/Feature1

Feature1
Merge pull request #56 from pinguo-liaofeng/Feature1

liaofeng
test
Merge pull request #58 from pinguo-wangzhong/Feature1

Feature1
lihaiMerge branch 'Feature1' of https://github.com/pinguo/lession2 into show

Conflicts:
	lession2.txt