添加了readme.txt文件
update readme last line
& simple
conflict fixed
test readme
merge with no-ff