added gross thrust calc to aero, (and now passing in area from inlet)
better convergence
Merge branch 'master' of https://github.com/jcchin/Hyperloop
broken
interim...
merged jeffs stuff