upgrading ruby on heroku
home page html added
new index
fixed conflict