The Event object class to be used by the callendar
Merge branch 'master' of https://github.com/bradjohns94/Team-Software-Project