local files for merge
Merge branch 'master' of https://github.com/goens/masterarbeit

Conflicts:
	final_document/kernels.tex
	final_document/mixedideals.tex
changes on the desktop pc
Merge branch 'master' of https://github.com/goens/masterarbeit