Changed data fidelity slightly
syncing stuff
Merge branch 'master' of https://github.com/astrofoley/astr596

Conflicts:
	plots/1_composites.png

	plots/composite,-2.99.2.99.0.00.0.08.0.81.1.88.-19.65.-19.12.-0.26.-0.01--0.04.0.02.1.23.-19.36.-0.10--137SNe.dat
	src/composite.pyc