add readme.txt
f1 readme
master readme
master readme modify
add merge
merge dev --no--ff
modify bug 101
modify bug 101