bootstrap
gem rails_12factor
refresh assets for gmap
add precompiled assets
assets for heroku
assets for heroku
remove manifest file
empty commit
merge conflict