all the calendar things
fix merge conflicts
Merge pull request #17 from ahsterling/steph

Steph