First delivery
Merge https://github.com/thijsluc/Programmingassignment3.3