Scheduled EventList
Fixed merge conflicts
More ScheduledEventList
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev
stuff sorry bad commit name