C++ DP-Means
change fix

Merge branch 'master' of https://github.com/Planeshifter/DirchletProcessMixtureModel

Conflicts:
	server.R