progress bar stuff
Merge branch 'master' of https://github.com/belcortes/cupcake_game