061313 #5

Added collision detection