Implemented the collision detection code
Merge branch 'master' of https://github.com/simplerr/Project-TDDI02