pair programming
Merge branch 'master' of https://github.com/scmorse/bantam

Conflicts:
	src/codegenmips/MIPSVisitor.java