commit for merging
Merge branch 'master' of https://github.com/magehrig/Chemiemensa

Conflicts:
	presentation/pres.aux
	presentation/pres.log
	presentation/pres.nav
	presentation/pres.pdf
	presentation/pres.synctex.gz
bla