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

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

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

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

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

Feature1