Weather
Makefile
Merge branch 'master' of https://github.com/daria-dsm/frogisgreen

Conflicts:
	Makefile