Collision resetxy fix
Merge branch 'master' of https://github.com/ijbentje/KBS-Semester1-Groep5.git