Removed all shift/reduce conflicts. Hopefully final revision for asg3.