Fix conjuction/disjunction typo
Merge pull request #21 from sergv/master

Fix conjuction/disjunction typo
fix typos