updated the collision detection algorithm. still not perfect.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'