update weather
Merge branch 'news'

Conflicts:
	testfile.txt