Created Propulsion trade study
Merge branch 'editing'