created working branch and changed public/index.html
Update gemfile for deployment to Heroku
updated index file
updated gemfile for heroku
resolved conflicts