rewriting the readme, including instructions for deployment on Heroku
Merge branch 'master' into heroku