end update
Merge branch 'master' of https://github.com/RenaatST/cp3_whiteboard_groep9

Conflicts:
	controller/WhiteboardsController.php
	css/screen.css