precompile assets
add rails_12factor to gemfile
bundle install with new gemfile
update styles with background
resolve merge conflicts