Korrekturen
Merge branch 'master' of https://github.com/pren-t27/pren1

Conflicts:
	doc/doc/concept.tex