heroku prep
merging bootstrap files