Updated gems.
Fixing merge errors.
Precompiled assets.
Trying to fix asset pipeline.
Trying to fix heroku.
Merge branch 'master' of github.com:davidmccoy/byob.ar