refactored events
Merge branch 'master' of https://github.com/matthewvilim/FireAndIce-iOS

update