Updated the pedestal trigger odb templates
Merged changes within master to begin testing the new Amplitude vs Timing
difference spectra
Resolved conflict for odb template file
Merge branch 'master' of github.com:thnam/AlcapDAQ

Conflicts:
	odb_template/crate_9_normal_trigger.odb