kleurtjes aangepast
Merge branch 'master' of github.com:scrambled-apps/Studucation

Conflicts:
	.idea/workspace.xml