Added events
update
Merge branch 'master' of https://github.com/weedz/lab5.git