Merge branch 'chdrost'
Merge branch 'chdrost'
Merge branch 'chdrost'
git ignore
Merge branch 'master' into chdrost

Conflicts:
	Protokolle.log
	Protokolle.pdf