design changes
merging
Merge branch 'master' of https://github.com/PhilippGronotte/DalgoProjekt1

Conflicts:
	GUI.m

merge
merge
Weathericons added in Gui