Neu
Merge branch 'master' of https://github.com/purtpelhcs/InfoB

Conflicts:
	Blatt4/CompareGeometry.java
Neu