updated index file
updated gemfile for heroku
resolved conflicts