Na TOm's commit gedaan
Commit conflicts solved