herindeling
Merge https://github.com/rvnijnatten/OOP2