Update README.md

merge readme and master branch