fixinge reduce/reduce and shift/reduce conflict in the parser
Merge branch 'master' of https://github.com/ptal/nominal-workbench
Finished and tested include system