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
aaaaaaaaaaaaa
Merge pull request #45 from pinguo-liuzhaohui/Feature1

Feature1
Merge remote-tracking branch 'lhw2/Feature1' into Feature1

Conflicts:
	lession2.txt
aaaaaaaaaaaaa
Merge pull request #51 from pinguo-majianguang/Feature1

Feature1
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