add assets
fix gem file for heroku
get rid of unused assets
fix merge conflict