upd
Merge branch 'master' of https://github.com/michbur/chipPCR

Conflicts:
	vignettes/chipPCR.Rnw