Update gemfile.locl for heroku
Added precompiled assets
Fixed routes
Merge branch 'filling-in-layout'