starting ajax
Merge branch 'master' of https://github.com/belcortes/cupcake_game
pulling
Merge branch 'master' of https://github.com/belcortes/cupcake_game