stupid commit only to allow pull
Merge branch 'master' of github.com:michbur/qPCR_workflow

Conflicts:
	RJwrapper.brf