tst
Merge branch 'chdrost'

Conflicts:
	Protokolle.pdf
Merge branch 'chdrost'

Conflicts:
	Protokolle.pdf
Merge branch 'chdrost'

Conflicts:
	Protokolle.pdf
Mal am LAPD weitergebastelt
Merge branch 'master' of https://github.com/dkadio/Protokolle-Ausarbeitung

Conflicts:
	Protokolle.aux
	Protokolle.bbl
	Protokolle.tex
	quellen.bib
Merge branch 'master' into chdrost