Finished… started on bonus
Merge branch 'master' of https://github.com/haren/UvA_SoftwareTestingAndVerification_GrD2_1