bla
Merge branch 'master' of https://github.com/magehrig/Chemiemensa
I am tired
Merge branch 'master' of https://github.com/magehrig/Chemiemensa

Conflicts:
	doc/latex/graphics/Fige-eps-converted-to.pdf
	doc/latex/reportTemplate.aux
	doc/latex/reportTemplate.log
	doc/latex/reportTemplate.pdf
	doc/latex/reportTemplate.synctex.gz
	doc/latex/reportTemplate.tex
	doc/latex/reportTemplate.toc