for test
Merge pull request #12 from pinguo-liuzhaohui/Feature1

update
baiziying add a line
add
add
Merge pull request #14 from pinguo-baiziying/Feature1

baiziying add a line
add
for test�
Merge pull request #17 from pinguo-liuhongwei/Feature1

Feature1
aaaaa
aofeng`:
baiziying add a line
aaaaaaaa
Merge pull request #18 from pinguo-shenqiang/feature

for test
aaaaaaaaaaa
Merge remote-tracking branch 'lhw2/Feature1' into Feature1

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

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

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

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

Conflicts:
	lession2.txt