copy calendar.usholiday
Change April Fool's Day to 05/01
Change Ground Hog Day to 02/03 --amend
Change Veterans' Day to 11/12
Change New Year's Day to 01/02
Change New Year's Day to 02/02
New Year's Day conflict fixed
Merge https://github.com/ky822/assignment2
Merge pull request #29 from ky822/master

Solve the conflict