update readme.md

merged files with the dev branch