Finished up until CONOPS-2. Now time for doing trade studies
Ready to put in trade study information
Merge branch 'master' of https://github.com/RascalSeniorDesign/Preliminary-Design