Updates to DayView
resolving merge conflicts
storing code
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev
updating code