new asteroids
Merge remote-tracking branch 'origin/master'

Conflicts:
	game_v1/src/scenes.js
new asteroids