tt
Merge branch 'master' of https://github.com/bhegmanns/bernd

Conflicts:
	text003.txt