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