Added three gaussian model
Merge branch 'master' of https://github.com/npcottaris/GitOrDie into ThreeGaussianModel

Conflicts:
	simulate.m