Added methods to the CodeGenVisitor
Added methods to the CodeGenVisitor
Conflicts fixed, merge complete.
Merge branch 'master' of https://github.com/DSCore/BantamJava4B2

Conflicts:
	bin/Main.class
	bin/cfg/BasicBlock.class
	bin/cfg/ErrParamInst.class
	bin/codegenmips/CodeGenVisitor.class
	bin/java_cup/CUP$parser$actions.class
	bin/java_cup/Main.class
	bin/java_cup/emit.class
	bin/java_cup/lalr_state.class
	bin/java_cup/lexer.class
	bin/java_cup/production.class
	bin/java_cup/runtime/lr_parser.class
	bin/lexer/Lexer.class
	bin/lexer/Token.class
	bin/treedrawer/LayoutVisitor.class
	bin/util/ErrorHandler.class
	bin/visitor/TypeCheckVisitor.class