added to readme including heroku app
resolving conflicts