bad collision detection

Conflicts:
public_html/js/asteroid.js
Merge branch 'master' of https://github.com/cherevik/Asteroids

Conflicts:
	public_html/js/asteroid.js
Merge branch 'master' of https://github.com/cherevik/Asteroids

Conflicts:
	public_html/js/asteroid.js
Merge origin/master