commit
Merge branch 'master' of
https://github.com/liufei11111/amazon_hackathon.git

Conflicts:
	src/manual_test/RunGaussianMix.py