merge with no-ff
fix bug 101
merge test.txt
Merge branch 'master' of github.com:cuiketing/learngit