This is a test
Merge remote-tracking branch 'origin/master'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	bin/.gitignore
	bin/DailyRecord.class
	bin/Project1ParseTest.class
	bin/Project1Test.class
	bin/Station.class
	bin/StationRainfallComparator.class
	bin/StationStatistics.class
	bin/Stats.class
	bin/UserInputException.class
	bin/YearlyData.class
	bin/YearlyRecord.class

should be a of a semi complete Userinput class
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 00991533bc769315643c3bb4812fde6d84ceaca1.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	bin/.gitignore
	bin/DailyRecord.class
	bin/Project1ParseTest.class
	bin/Project1Test.class
	bin/Station.class
	bin/StationRainfallComparator.class
	bin/StationStatistics.class
	bin/Stats.class
	bin/UserInputException.class
	bin/YearlyData.class
	bin/YearlyRecord.class