Commit of second part of collision detection ->
http://www.kilobolt.com/day-5-collision-detection-part-2.html