Merge branch 'master' of heroku.com:aviaricious
user may now view favorites
Merge branch 'master' of github.com:afeinber/aviaricious