Heatindex en weervoorspelling
Merge remote-tracking branch 'origin/master'

Conflicts:
	Weerstation.java