Nietveelsoeps
Merge branch 'master' of https://github.com/Lastje/PW7---ROCAVENTUSAO

Conflicts:
	templates/main.php
Merge branch 'master' of https://github.com/Lastje/PW7---ROCAVENTUSAO