about to pull
Merge branch 'master' of https://github.com/belcortes/cupcake_game
changed home index to haml
tried to add jquery ui