Corrigindo submissao...
Merge branch 'cache' into branch

Conflicts:
	mips1_isa.cpp