calendar added
April Fool's changed and Ground Hog Day change amended
Veteran's Day changed
New Year's Day changed to 01/02
New Year's Day changed to 02/02
Conflicts fixed
Merge branch 'master' of https://github.com/HenryChang990/assignment2