first commit
altered fool's day and gound hog day
altered veteran's day
altered new year's day on master
altered new year's day on testing
merged testing and resolved conflits
Merge branch 'master' of github.com:yx886/assignment2
Merge pull request #3 from yx887/master

Pull request from yx887