Added support for logical or- and logical and expressions in grammar.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>