Fade as lose energy
Merge branch 'master' of github.com:dmazin/asteroid-tycoon

Conflicts:
	game.js