test2
Merge branch 'master' of https://github.com/bastido/ITCSP.git

Conflicts:
	Koenig/src/model/Muehle.java