changed models
Merge branch 'master' of https://github.com/belcortes/cupcake_game
started adding facebook login
fixed better errors error