collision changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	HTML5Application/public_html/oh/RocketShip.js
Merge branch 'master' of https://github.com/a-morn/OhLookDiamonds