Updated cup file but still has errors
Commiting second time((
Merge branch 'master' of https://github.com/JingLiNaomi/compilerCwk

Conflicts:
	CUP$parser$actions.class
	Yylex.class
	Yylex.java
	Yylex.java~
	parser.class
	parser.java
	q.cup
	q.flex
	sym.java
	test1.txt