Merge branch 'master' of https://github.com/Brugselaar/CP3_eindopdracht_groep23

Conflicts:
Basic MVC setup
Merge branch 'master' of https://github.com/Brugselaar/CP3_eindopdracht_groep23

Conflicts:
Change of Structure