udated tests
Merge branch 'master' of https://github.com/mhenry/headway

Conflicts:
	test/WeatherReportTest.java