add function to help photon - erg conversion
add function to help convert ergs to photons and back
Merge branch 'master' of ssh://github.com/stoughto/MKIDStd

Conflicts:
	MKIDStd.py