fixing merge
Merge branch 'master' of https://github.com/sperez8/microbPLSA.git

Conflicts:
	MicrobProcessor/D3/pcplots/otus.js