SO

Ich hab da mal was gemacht
Merge branch 'master' of https://github.com/alterichhabkb/Prog2-Projekt

Conflicts:
	test.txt