aktivity hopefully the last time, please check and change if there is anything wrong
Merge branch 'master' of https://github.com/KITrokopter/graphics

Conflicts:
	Objektmodell.png