kelly stuff
Merge branch 'master' of https://github.com/cperez3/CandyShop