Aufgabe 1 95% done
Merge branch 'uebung2' of https://github.com/stephde/CG2Uebung into uebung2

Conflicts:
	source/Painter.cpp