Small corrections
Merge branch 'caches' of https://github.com/tiagoamartins/ece552_project into caches

Conflicts:
	cpu.v