Github Standart Commit
Merge remote-tracking branch 'origin/Test' into Test

Conflicts:
	KPROG-Projekt/project.greenfoot