Refactering na iteratie 2
Merge pull request #104 from MPieter/master

Refactering na iteratie 2