fixed merge conflict
Merge pull request #4 from micahsherman/events

Events