duh winning
Merge branch 'master' of https://github.com/brmahar/TSPCalendar

Conflicts:
	src/TheCalendar.java