GameTime is saved at draw, and cleanups
Shape intersections fix

Circle and rectangle should only contain one point (not 2) for a line to
intersect with it
Conflict fix