added user, cupcake, ice cream, and cookie models
Merge branch 'master' of https://github.com/belcortes/cupcake_game