Bug fix in collision detection.

The case of already touching disks is now handled. A simple test case
was also added.