current konfiguration progress
Merge branch 'master' of https://github.com/holzleube/thesis

Conflicts:
	content/02kapitel.tex
	dokumentation.pdf