Fixed Atmos
Added a few more O2 Canisters
Added 2 Solar Arrays
Changed some weird wiring
Changed the Map Merge Tools to AsteroidStation.dmm
Merge pull request #3 from CorruptComputer/master

Fixed Atmos