modified some code
Merge branch 'master' of https://github.com/nestorga/cs169
nothing really changed
merge resolution
added basic CRUD for events