commit2
add weather
Merge commit '023aba557f5a28da42ae4ac68e3e068c07c6f099'

Conflicts:
	test.no