better events
Merge branch 'master' of github.com:codemkrs-team-name/codemkrs-challenge