Voor lau!
Merge branch 'master' of https://github.com/Prikkel/UML

Conflicts:
	application/views/register_view.php