Merging heroku and bootstrap