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

Conflicts:
	classes/Database.php
css
Merge branch 'master' of https://github.com/Lastje/PW7---ROCAVENTUSAO

Conflicts:
	templates/inloggen.php