TEST
Merge branch 'master' of https://github.com/KompAlgToTheMax/Uebung6

Conflicts solved

Conflicts:
	Main.java