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

Conflicts:
	js_dist/script.dist.js
	js_dist/script.dist.js.map
Merge branch 'master' of https://github.com/LefebvreJil/CP3-groepswerk-2DEV2-groep4