Neues Super-Feature
Test in Nr2
Merge branch 'nr2'

Conflicts:
	simon.txt