stuff
Merge branch 'master' of https://github.com/KennyParkinson/asteroids
Merge branch 'master' of https://github.com/KennyParkinson/asteroids

Conflicts:
	scripts/renderer.js