merging
Merge branch 'dev' of https://github.com/samdec11/VirginGalactic into dev