{A}
Merge branch 'master' of https://github.com/astrofoley/astr596

Conflicts:
	data/spectra/cfa/sn1995D/sn1995D-19950307.32-fast.flm
	data/spectra/cfa/sn1998bu/sn1998bu-19980601.18-fast.flm
	data/spectra/cfa/sn1998dk/sn1998dk-19981024.26-fast.flm
	data/spectra/cfa/sn2002jm/sn2002jm-20021216.45-mmt.flm
	data/spectra/cfa/sn2005A/sn2005A-20050107.25-fast.flm
	data/spectra/cfa/sn2005cf/sn2005cf-20050616.19-fast.flm
	data/spectra/cfa/sn2005mc/sn2005mc-20051227.37-fast.flm
	data/spectra/cfa/sn2006ax/sn2006ax-20060326.29-fast.flm
	data/spectra/cfa/sn2007ca/sn2007ca-20070622.18-fast.flm
	data/spectra/cfa/sn2007co/sn2007co-20070618.35-fast.flm
	data/spectra/cfa/sn2007sr/sn2007sr-20080103.53-fast.flm
	data/spectra/cfa/sn2008A/sn2008A-20080111.19-fast.flm
	data/spectra/cfa/sn2008A/sn2008A-20080112.10-fast.flm