calendar commit
amend groundhog
veterans
new year
new year 2
Merge branch 'testing'

Conflicts:
	ssz225/ssz225
Merge branch 'master' of https://github.com/ssz225/assignment2