Update
test.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Station.java

	modified:   .classpath
	modified:   ProjectTwo.uxf
	modified:   bin/.gitignore
	modified:   bin/DailyData.class
	modified:   bin/DailyRecord.class
	modified:   bin/MonthlyData.class
	modified:   bin/Observation.class
	deleted:    bin/Project1ParseTest.class
	deleted:    bin/Project1Test.class
	modified:   bin/Project2.class
	modified:   bin/Record.class
	modified:   bin/Station.class
	modified:   bin/StationRainfallComparator.class
	modified:   bin/StationStatistics.class
	modified:   bin/Stats.class
	modified:   bin/UserInputException.class
	modified:   bin/UserSettings.class
	modified:   bin/YearlyData.class
	modified:   bin/YearlyRecord.class
	modified:   src/DailyData.java
	modified:   src/DailyRecord.java
	modified:   src/MonthlyData.java
	modified:   src/Observation.java
	modified:   src/Project2.java
	modified:   src/Project2MonthStatsTest.java
	renamed:    src/Project1ParseTest.java -> src/Project2ParseTest.java
	modified:   src/Project2StatsTest.java
	modified:   src/Record.java
	modified:   src/Station.java
	modified:   src/StationRainfallComparator.java
	modified:   src/StationStatistics.java
	modified:   src/Stats.java
	modified:   src/UserInputException.java
	modified:   src/UserSettings.java
	modified:   src/YearlyData.java
	modified:   src/YearlyRecord.java