working on bug where user not signed in
Merge branch 'master' of heroku.com:aviaricious