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

Conflicts:
	TNF2D/public_html/hero.js