yichi's change
Merge branch 'master' of https://github.com/anbeier/Beispiel

Conflicts:
	test.txt