getting changes
Merge branch 'master' of git://github.com/jfmrothe/AST523project

Conflicts:
	cluster.cc
	multinest.cc