Konflikttest...
Testkonflikt
Merge branch 'master' of https://github.com/Fitze/WAB_3

Conflicts:
	Testfile.tex