added a collision test
Merge branch 'phys'