fixed cal, sort of
Merge branch 'master' of github.com:stuycs-softdev/proj2-pd6-06-GoodMorning