calendar.py added. Would like to modify this to be how the start and end dates and times are determined.
Resolving merge conflicts; basically took the calendar code I wrote for the UI, but added in calendar.py