conflict
Merge branch 'master' of https://github.com/carolinwilhelm/ourGitHub

Conflicts:
	jetzt test.txt
Merge branch 'master' of https://github.com/carolinwilhelm/ourGitHub

Conflicts:
	jetzt test.txt