edits
Merge branch 'master' of github.com:liquidg3/liquidfire-curium

Conflicts:
	behaviors/Collision.js