Added the start of the collision handling
Merge branch 'master' of https://github.com/simplerr/Project-TDDI02