Wetterstation
Wetterstation
Wetterstation
a
Merge branch 'master' of https://github.com/timnot90/APS.git

Conflicts:
	Entenspiel/src/logik/Simulator.java
Merge branch 'master' of https://github.com/timnot90/APS.git
j