changes for heroku cedar stack
Updated readme.md
Resolved Merge conflict
Updated Gemfile