mccall did stuff and i did the ugly event form
Merge branch 'master' of https://github.com/gcella/Hackathon-Fall-2014