merge with no-ff
fix bug 101
merged bug fix 101
Create test_pull.txt
msg:test pull request
add a test
Merge pull request #1 from miaoyushun/master

Create test_pull.txt
Merge pull request #2 from wrw2013/master

msg:test pull request
Merge pull request #9 from lzhengms/master

体验一把pull request，谢谢提供的git教程文章
test_fork_pull.txt
Merge pull request #11 from Mr-He/master

test_fork_pull.txt
first test pull request
Merge pull request #12 from fkdtz/master

first test pull request
luodinonesheng@gmail.com
Merge pull request #13 from Luodinonesheng/master

luodinonesheng@gmail.com
test
haha
Merge pull request #14 from JoshuaYang/master

test
Create testpull
Merge pull request #16 from hiilou/patch-1

Create testpull