added mainbase
solving conflict
reducing mass of base
changing the timestep back to the proper one
Merge branch 'gh-pages' of git://github.com/killfall/asteroid-prospector
adding the real space station picture
Added space station