add assets
Merge branch 'master' of heroku.com:rails4-app