syncing from work
changes to pull
run rake assets precompile to fix css issue on heroku