updated Readme
Merge branch 'develop'
Merge branch 'master' of heroku.com:octonemesis