working on csm model
merged jeffs stuff
Merge branch 'master' of https://github.com/jcchin/Hyperloop
Merge branch 'master' of https://github.com/jcchin/Hyperloop
stuff