edits
Merge branch 'master' of https://github.com/dasongle/nonparametric_mixture

Conflicts:
	ICML2014/nonparametric_mixture.tex