add readme.txt
update readme.md
Merge branch 'dev'