update event processing
Merge branch 'master' of https://github.com/mcdc09/CX4230_ProjectTwo