I HATE GITHUB!
Merge branch 'master' of https://github.com/Temestokles/gruppeweb

Conflicts:
	weather.php
Merge branch 'master' of https://github.com/Temestokles/gruppeweb