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

Conflicts:
	bin/MIPSimulator.class
	bin/Main.class
	src/MIPSimulator.java