Merge remote-tracking branch 'origin/Josh'

Conflicts:
	bin/MonthlyData.class
	bin/Station.class
	bin/StationStatistics.class
	bin/Stats.class
	src/Stats.java