fixed the calendar
Merge branch 'master' of https://github.com/joubin/CSC191