alert
Merge branch 'master' of https://github.com/ejtalis/Solar-Sysdoom

Conflicts:
	solargame.js