fixed conflict.
Merge branch 'master' of https://github.com/sperez8/microbPLSA.git

Conflicts:
	MicrobProcessor/Analysis/correlations.py