Werkend gummen rondje, cirkel, vierkant
Merge branch 'master' of github.com:omgjens/SchetsPlus

Conflicts:
	ObjectControl.cs