collision detection completed
Collision detection added.
Merge branch 'master' into gh-pages