aofeng`:
Merge remote-tracking branch 'lhw2/Feature1' into Feature1

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

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

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

Conflicts:
	lession2.txt
baiziying add a line
test
aaaaaaaaaaaaa
Merge pull request #27 from pinguo-liuhongwei/Feature1

add
aaaaaaaaaaaaa
Merge remote-tracking branch 'lhw2/Feature1' into Feature1
baiziying add a line
test
Merge branch 'Feature1' of https://github.com/pinguo/lession2 into Feature1
Merge pull request #30 from pinguo-baiziying/Feature1

baiziying add a line
aaaaaaaaaaaaa
test
aofeng
Merge remote-tracking branch 'lhw2/Feature1' into Feature1

Conflicts:
	lession2.txt