change COND to COMPARISON
add EXPRESSION token
start expressions
Merge branch 'master' of https://github.com/alongubkin/modern