updates
fixed merge conflicts
Revert ae96d5a..20c0b30

This rolls back to commit ae96d5a666f8fc7c533eb1c8afc363e3bcfc1297.
updates, lexer types the tokens
added Error.c
updates
updates
Merge branch 'dev3'