Modified README
Added Postgres gem to the production environment
Update Gemfile and Gemfile.lock for Heroku
Fixed merge conflict with dev