Added collision detection.
Merge pull request #6 from NintenJoe/Task-6.1

Added collision detection