Slight alterations after previous lage merge.
Changes were only to test failing functions and add comments.  I will adjust to include the other changes in the next grouping.
Verified second view of merge conflics.

Fixed merge conflixs of imort lines (removed duplicates)
All code runs
All tests work

//Merge branch 'calendar1' of https://github.com/tomorrow-nf/wpi-suite-team5 into calendar1

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/models/YearData.java