merge old stuff
Merge branch 'master' of https://github.com/SimonGadgeteer/PROG1.git

Conflicts:
	Zuul2/src/Raum.java
	Zuul2/src/Resources/zuul_de_CH.properties
	Zuul2/src/Spiel.java