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

Conflicts:
	Testfile.log
	Testfile.pdf
	Testfile.synctex.gz
	Testfile.tex
Merge branch 'master' of https://github.com/Fitze/WAB_3

Conflicts:
	Testfile.log
	Testfile.pdf
	Testfile.synctex.gz
	Testfile.tex