copy calendar
Change to 2/3
Change to 11/12
Change to 1/2
Change to 2/2
Fixed conflict and merge
Merge branch 'master' of https://github.com/yl2612/assignment2
Merge pull request #22 from yl2612/master

Assignment 2 by Yunshi (Kayla) Li