test
Merge branch 'master' of https://github.com/mheAC/SchulprojektAE.git

Conflicts:
	src/start_gui/test2.java