More logic on events
Merge branch 'master' of https://github.com/keyaral/SwenProject.git
Up to date with Tyler