changes from daq computer
Merge branch 'master' of https://github.com/Charge-readout-test-stand/charge-readout-scripts

Conflicts:
	TPMLog.py