theta
Merge branch 'master' of https://github.com/MaartenKruijver/DNAprofiles

Conflicts:
	R/rmp.R
	man/cond.ki.cdf.Rd