Toevoeging Klassen - Merge 2

Merge
Merge branch 'Yusupha' of https://github.com/Ipmedt4groep3/CBDapplication into Yusupha

Conflicts:
	.gradle/1.10/taskArtifacts/cache.properties.lock
	.idea/workspace.xml