Changed parser to allow combinatorial expressions as condition in if expressions
Merge pull request #20 from jim-collins/master

Changed parser to allow combinatorial expressions as condition in if expression