master_1
master_2
master_groundhog
testing_veterans
master_newyear
testing_newyear
Merge branch 'testing'
"merge_conflict_commit"
Conflicts:
	jl6583/calendar.usholiday
Merge https://github.com/EMIAOZANG/assignment2
"MERGE FROM FORK"