from my mac
sovle conflict m
erge branch 'master' of https://github.com/2waybene/mixturemodel

Conflicts:
	Scripts/_2class_prediction.R
Merge branch 'master' of https://github.com/2waybene/mixturemodel
new stuffs
another