adding event in progress
Merge branch 'development' of https://github.com/teekaykern/csc150-group3-final into development
stuff
Merge branch 'development' of https://github.com/teekaykern/csc150-group3-final into development
but hey... it compiles...