trying to update and push
Merge branch 'github_cse131' of https://github.com/huypham612/cse131.git
into github_cse131

check 3 & 4.

Conflicts:
	bin/CUP$parser$actions.class
	bin/FuncSTO.class
	bin/MyParser.class
	bin/STO.class
	bin/VarSTO.class
	bin/VoidType.class
	src/MyParser.java
	src/rc.cup