added weather
Merge branch 'master' into colour

Conflicts:
	testfile