commit in order to solve merge conflict
Merge remote-tracking branch 'origin/master'
Geen "rode kruiskens" meer in QuizDeelname