initial commit for heroku
fixed merge conflict in readme.md