Merge branch 'master' of https://github.com/mjt5v/ComputerArchitectureClassProject

Conflicts:
	src/main/java/edu/gwu/comp/arch/gui/DASFrontPlate.png
	src/main/java/edu/gwu/comp/arch/gui/Main.java
	src/main/java/edu/gwu/comp/arch/gui/exeDown.png
	src/main/java/edu/gwu/comp/arch/gui/exeUp.png
	src/main/java/edu/gwu/comp/arch/gui/fetchDown.png
	src/main/java/edu/gwu/comp/arch/gui/fetchUp.png
	src/main/java/edu/gwu/comp/arch/gui/haltDown.png
	src/main/java/edu/gwu/comp/arch/gui/haltStep.png
	src/main/java/edu/gwu/comp/arch/gui/haltUp.jpg
	src/main/java/edu/gwu/comp/arch/gui/i1.png
	src/main/java/edu/gwu/comp/arch/gui/i2.png
	src/main/java/edu/gwu/comp/arch/gui/i3.png
	src/main/java/edu/gwu/comp/arch/gui/instructionStep.png
	src/main/java/edu/gwu/comp/arch/gui/iplDown.png
	src/main/java/edu/gwu/comp/arch/gui/iplUp.png
	src/main/java/edu/gwu/comp/arch/gui/ir.png
	src/main/java/edu/gwu/comp/arch/gui/ledBlue.png
	src/main/java/edu/gwu/comp/arch/gui/ledGreen.png
	src/main/java/edu/gwu/comp/arch/gui/ledOff.png
	src/main/java/edu/gwu/comp/arch/gui/ledRed.png
	src/main/java/edu/gwu/comp/arch/gui/pc.png
	src/main/java/edu/gwu/comp/arch/gui/power.png
	src/main/java/edu/gwu/comp/arch/gui/processStep.png
	src/main/java/edu/gwu/comp/arch/gui/r0.png
	src/main/java/edu/gwu/comp/arch/gui/r1.png
	src/main/java/edu/gwu/comp/arch/gui/r2.png
	src/main/java/edu/gwu/comp/arch/gui/r3.png
	src/main/java/edu/gwu/comp/arch/gui/runIR.png
	src/main/java/edu/gwu/comp/arch/gui/runPC.png
	src/main/java/edu/gwu/comp/arch/gui/storeDown.png
	src/main/java/edu/gwu/comp/arch/gui/storeUp.png
	src/main/java/edu/gwu/comp/arch/gui/switchDown.png
	src/main/java/edu/gwu/comp/arch/gui/switchUp.png
	src/main/resources/DASFrontPlate.png
	src/main/resources/exeDown.png
	src/main/resources/exeUp.png
	src/main/resources/fetchDown.png
	src/main/resources/fetchUp.png
	src/main/resources/gui/DASFrontPlate.png
	src/main/resources/gui/exeDown.png
	src/main/resources/gui/exeUp.png
	src/main/resources/gui/fetchDown.png
	src/main/resources/gui/fetchUp.png
	src/main/resources/gui/frontPanel.form
	src/main/resources/gui/haltDown.png
	src/main/resources/gui/haltStep.png
	src/main/resources/gui/haltUp.jpg
	src/main/resources/gui/i1.png
	src/main/resources/gui/i2.png
	src/main/resources/gui/i3.png
	src/main/resources/gui/instructionStep.png
	src/main/resources/gui/iplDown.png
	src/main/resources/gui/iplUp.png
	src/main/resources/gui/ir.png
	src/main/resources/gui/ledBlue.png
	src/main/resources/gui/ledGreen.png
	src/main/resources/gui/ledOff.png
	src/main/resources/gui/ledRed.png
	src/main/resources/gui/pc.png
	src/main/resources/gui/power.png
	src/main/resources/gui/processStep.png
	src/main/resources/gui/r0.png
	src/main/resources/gui/r1.png
	src/main/resources/gui/r2.png
	src/main/resources/gui/r3.png
	src/main/resources/gui/runIR.png
	src/main/resources/gui/runPC.png
	src/main/resources/gui/storeDown.png
	src/main/resources/gui/storeUp.png
	src/main/resources/gui/switchDown.png
	src/main/resources/gui/switchUp.png
	src/main/resources/haltDown.png
	src/main/resources/haltStep.png
	src/main/resources/haltUp.jpg
	src/main/resources/i1.png
	src/main/resources/i2.png
	src/main/resources/i3.png
	src/main/resources/instructionStep.png
	src/main/resources/iplDown.png
	src/main/resources/iplUp.png
	src/main/resources/ir.png
	src/main/resources/ledBlue.png
	src/main/resources/ledGreen.png
	src/main/resources/ledOff.png
	src/main/resources/ledRed.png
	src/main/resources/pc.png
	src/main/resources/power.png
	src/main/resources/processStep.png
	src/main/resources/r0.png
	src/main/resources/r1.png
	src/main/resources/r2.png
	src/main/resources/r3.png
	src/main/resources/runIR.png
	src/main/resources/runPC.png
	src/main/resources/storeDown.png
	src/main/resources/storeUp.png
	src/main/resources/switchDown.png
	src/main/resources/switchUp.png