CollisionDetection updated with if statement to chack which objects that are colliding
Merge branch 'master' of https://github.com/filipcarlen/ooproj-18