changes to app
Update README.md
Update README.md
solving readme conflicts