First commit
Merge branch 'master' of https://github.com/babcockd/dougsspacegame

Conflicts:
	LICENSE