opslaan en laden
Merge branch 'master' of https://github.com/PehrGit/Cpp1

Conflicts:
	Week4DaanMollee/ChildView.cpp
	Week4DaanMollee/ChildView.h
	Week4DaanMollee/EllipseDraw.cpp
	Week4DaanMollee/EllipseDraw.h
	Week4DaanMollee/RectangleDraw.cpp
	Week4DaanMollee/RectangleDraw.h
	Week4DaanMollee/Shape.h
	Week4DaanMollee/resource.h