Initial push for the Calendar Branch
Merge branch 'calendar' of https://github.com/woodenToaster/EECS_448_Project into calendar