Pulled from origin.
Merge branch 'master' of https://github.com/pascalkimhuber/WissRech1

Conflicts:
	Blatt4/Mesh.h