to resolve the conflict
Merge branch 'master' of https://github.com/2waybene/mixturemodel

Conflicts:
	pipeLineScripts/_final_figure4.R