df
Merge branch 'master' of https://github.com/UltimateProject/Wettervorhersage-Programm

Conflicts:
	weather.xml