Implement collision using CountDistance()
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/js/game.js
Implement collision using CountDistance()