my commit
Merge branch 'master' of https://github.com/wweqqful/CS-251-EventOrganizer