haha we gaan nu merge errors krijgen
Merge branch 'master' of https://github.com/olafeee/HvA-virt-website

Conflicts:
	views/login/index.php
merge error