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

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

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

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

Conflicts:
	lession2.txt