update
Merge branch 'master' of https://github.com/michbur/qPCR_workflow

Conflicts:
	RJwrapper.pdf
	Roediger_2014.tex