add $and and $or
Merge branch 'master' of https://github.com/ticapix/simple-nosql.git