diverses
Merge branch 'master' of
https://github.com/robert-schi/MaxMohr_DieHeidin

Conflicts:
	Max_Mohr__Die_Heidin/src/main/latex/text.tex