Added literal and arithmetic expressions to evalExp
Fixed merge conflicts
Fixed merge conflicts