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

Conflicts:
	experiment/real_data_experiment_short.tex