merging in everythang
Merge pull request #156 from sinker/master

merging in the updated event form