guy file changes
some guy tweeks
Merge branch 'master' of https://github.com/mjt5v/ComputerArchitectureClassProject

Conflicts:
	src/main/java/edu/gwu/comp/arch/gui/DASPanel.java