issue #13 : fix conflics
Merge branch 'expression' of github.com:nurilabs/nuri-lang into expression