Updated CFG and ParseTree.

Added new rules to cfg and checked that all tokens are found. Need to
work on parser.