heroku setup
heroku setup
stuff
index layout stuff
Fixed merge conflict