hrosenblume/SpaceTraders2340 — pull request #1 by hrosenblume (2014-09-11 14:01:28+00:00)
Title: Original

Let's merge these two together. Is everyone okay with that?