Adding Aero Calc
lots of little additions all around, added small aero calc
fixed tube temp test (last commit) moved aero into api.py
Full Assembly working, re-organized assembly layout
Merge branch 'justin/master'

Conflicts:
	src/hyperloop/test/test_tube_temp.py
changing docs
merged jeffs stuff in
Merge branch 'master' of https://github.com/jcchin/Hyperloop
moved energy calc to mission, small clean-up throughout
promoted battery power margin to top level
Merge branch 'master' of https://github.com/jcchin/Hyperloop
more docs