vak mag html bevatten
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
vakken
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/project/project.blade.php
asdf
Merge remote-tracking branch 'origin/master'
projectcontroller