heroku setup
cetering background
app.rb merge conflicts
editing layout
heroku