stages
changes
Merge branch 'master' of https://github.com/MeDicenPilon/MIPSimulator

Conflicts:
	src/MIPSimulator.java