commit before merge
Merge branch 'master' of github.com:michbur/qPCR_workflow

Conflicts:
	figures/amp_melt.pdf