Merge pull request #3 from theyapps/master

Collision Detection
Merge remote-tracking branch 'origin/master' into gh-pages
Merge pull request #4 from theyapps/gh-pages

Make up to date