tristan jeff attempt
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_CEA.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	CEAFS.py
	test_CEA.py
added T,P tests
boo
Merge branch 'master' of https://github.com/jcchin/thermo
stuff