KRINNERT-FAIL?!
Merge branch 'master' of https://github.com/10Bude10/PIC_Simulator.git

Conflicts:
	picSimulator/src/simulator/InstructionManager/InstructionManager.java