Added asteroids, shortened grapple time, fixed some bugs.
Merge branch 'master' of https://github.com/mmarta/hex-gs

Conflicts:
	js/game.js