Added window to add events
Merge branch 'master' of https://github.com/RyPope/COMP3350