push
commit to push
neww values added
trying to plot new extended values
attempting to fix merge conflicts

Merge branch 'master' of github.com:slentzen/E25-PMT-Settings

Conflicts:
	main.R