more styling
resolved merge conflict
Merge branch 'dev' of https://github.com/samdec11/VirginGalactic into dev
shuttle outline
Merge branch 'dev' of https://github.com/samdec11/VirginGalactic into dev