merge

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

Conflicts:
	R/sim.R
merge

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

Conflicts:
	R/sim.R