Update grammar, fairly certain it satisfies LL(1)
Merge branch 'master' of ssh://github.com/nbsdx/CSSE404_Compilers