merge

Merge branch 'master' of https://github.com/kkmann/cme

Conflicts:
	R/cme.R
	R/gen.R
	R/misc.R
	R/mle.R
	R/sim.R
	man/estimateDataFiles.Rd
	man/simulateData.Rd
merge

Merge branch 'master' of https://github.com/kkmann/cme

Conflicts:
	R/sim.R