lölölö
Merge remote-tracking branch 'origin/test2'

Conflicts:
	Toiletten-Simulator/src/de/gss/ToilettenSimulation.java