angepasst
Merge branch 'master' of https://github.com/justayak/alp2

Conflicts:
	julian/aufgabe2.py
hausis