Fixing bad commit
Merge pull request #14 from jacob-nappi/calendarDev_1.1

Fixing bad commit