conflicts opgelost
sql
werkende versie na conflicts
Merge pull request #14 from VDABphilip/master

changes philip