weird conflict
Merge branch 'master' of https://github.com/dmanalac/PA5

Conflicts:
	CgenClassTable.class
	CgenClassTable.java
	assign.class
	attr.class
	block.class
	bool_const.class
	branch.class
	comp.class
	cond.class
	dispatch.class
	divide.class
	eq.class
	formalc.class
	int_const.class
	isvoid.class
	leq.class
	let.class
	loop.class
	lt.class
	method.class
	mul.class
	neg.class
	new_.class
	no_expr.class
	object.class
	plus.class
	static_dispatch.class
	string_const.class
	sub.class
	typcase.class