Conventions in events
Merge branch 'master' of https://github.com/Osherz5/PancakeStory