syncen
Merge branches 'master' and 'master' of https://github.com/LefebvreJil/CP3-groepswerk-2DEV2-groep4

Conflicts:
	_scss/_whiteboard.scss
	css/screen.css
	js/classes/Viewfunctions.js
	js_dist/script.dist.js
	js_dist/script.dist.js.map