changes
Merge branch 'auto-testing' of https://github.com/terryvdgriend/Interactive-Website into auto-testing

Conflicts:
	php_project/Interactivewebsite/beheer/assignment/script/script.js