commit
wefd
fwefwe
Autoload and autotests
Testen subsoort sort assignm
Merge remote-tracking branch 'origin/Sprint-5' into auto-testing
test 21-5
tsten 21-5 2
small fixes
Merge remote-tracking branch 'origin/Sprint-5' into small-fixes
more fixes
map shizzle fixed
Testen
changes
Merge branch 'auto-testing' of https://github.com/terryvdgriend/Interactive-Website into auto-testing

Conflicts:
	php_project/Interactivewebsite/beheer/assignment/script/script.js
Merge remote-tracking branch 'origin/Sprint-5' into auto-testing
Merge remote-tracking branch 'origin/Sprint-5' into small-fixes
Merge remote-tracking branch 'origin/small-fixes' into Sprint-5
db fixs
Merge remote-tracking branch 'origin/small-fixes' into Sprint-5