Update README.md
Merge branch 'master' into heroku