Commit to pull and merge
Fixed semi-trivial merge conflicts.

Merge branch 'master' of https://github.com/DSCore/BantamJava4B2

Conflicts:
	bin/codegenmips/CodeGenVisitor.class
	bin/codegenmips/MipsCodeGenerator.class
	src/codegenmips/CodeGenVisitor.java