My Changes
Meine Commitmessage
Merge branch 'master' of https://github.com/jmenzel/CG-P

Conflicts:
	src/PR4/TriangleMeshToHalfEdgeConverter.java