changes from the hackathon

the food was decent this time. Candy was crappy tho
Merge pull request #1 from tanyalsweeney/master

Changes from the hackathon