branch add 8
add 9 in master branch
conflict fixed
add c
without ff
a new branch: fenzhi1.readme.txt
a branch from fenzhi1
add 1 into file readme.txt
add 2 to readme.txt
this is testreadme.txt
fix bug 404
merge bug fix 404
change 2 lines
merage master branch to dev