fixed
Merge remote-tracking branch 'origin/Sprint-6' into Final-Styling-(Wouter)

Conflicts:
	php_project/Interactivewebsite/beheer/assignment/add.php