Merge pull request #15 from jtorraca/master

Changed all Events to Hackathons for consistency throughout
I think I fixed the relationships
Merge pull request #16 from LK/relationships-fix

Fixed relationships