Adding in Calendar and CalendarEvent objects and associated tests
Merge branch 'master' of https://github.com/benhejl/SWENG500_Team1