updated grammar, removing syntactic sugar
Merge branch 'Parser' of https://github.com/kobreu/compiler into Parser
Merge branch 'Parser' of https://github.com/kobreu/compiler into Parser
updated tests