Merge pull request #1 from tgstation/master
Copied the files to a new branch
Fuckin merge conflicts
Merge pull request #10 from CorruptComputer/AsteroidStation