branch test
commit readme.txt on the trature1 branch
commit the readme.txt on the master branch
conflict fixed
add merge
merge with no-ff
fix bug 101
change the bug
Merge branch 'master' of https://github.com/stevenLeeLB/test