changed
Fehler behoben

Merge branch 'trial' of https://github.com/NilsGG/test-repo

Conflicts:
	.gitignore