all of the methods working including zFromTemp
Merge branch 'compositeModel'

Conflicts:
	spectrumFitterClass.py
	test_spectrum.py