almost done with specs, missing re-render edit page on cupcake update
Merge branch 'master' of https://github.com/belcortes/cupcake_game
Merge branch 'master' of https://github.com/belcortes/cupcake_game