test merge
Merge branch 'master' of https://github.com/dsamojlenko/gcweather.git

Conflicts:
	gcweather/gcweather.info