Finished collision detection
Merged branches