ebenfalls geändert
Merge branch 'master' of https://github.com/zenith0/pytutorial

Conflicts:
	testdoku.txt