aufgabe 1 + anfang 2
Merge branch 'Uebung3' of https://github.com/stephde/CG2Uebung into Uebung3

Conflicts:
	source/DistanceTransform.cpp