...
Merge branch 'newViewModelConcept' of
https://github.com/mheAC/SchulprojektAE.git into newViewModelConcept

Conflicts:
	src/controller/Main.java