Programs finished
Merge branch 'master' of https://github.com/Pieter2406/OGP_assignment
final push
Merge branch 'master' of https://github.com/Pieter2406/OGP_assignment