Merge branch 'dev' into wip/switch-view-functionality
Personal Events are Red, Team events are Blue, Both events are purple,
If you erase, I will own you -_-
Merge branch 'wip/switch-view-functionality' of
https://github.com/frenchie16/wpi-suite-team6.git into
wip/switch-view-functionality

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/views/CalendarCalendarView.java
Event names for testList events now show in GUI weekView. Does not
null-out table upon changing weeks. (With Ryan & Robyn)
Merge branch 'wip/populate-day-week' of
https://github.com/frenchie16/wpi-suite-team6.git into
wip/populate-day-week