Replaced or, and by ||, &&
Replaced or, and by ||, &&

jjdekker/libminizinc,jjdekker/libminizinc,jjdekker/libminizinc,jjdekker/libminizinc,nathanielbaxter/libminizinc,nathanielbaxter/libminizinc,nathanielbaxter/libminizinc,nathanielbaxter/libminizinc