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
baiziying add a line
add
Merge pull request #27 from pinguo-liuhongwei/Feature1

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

baiziying add a line
fdsa