dev  modfiy readme.txt
fenzhi modfiy readme.txt
master modfiy readme.txt
clean
fenzhi modfiy
master modfiy
conflict fixed