some changes
repair
Merge branch 'Moving' of https://github.com/MathijsC/Glenn_Mathijs_W_project.git into Moving