test
mehmet
mehmet
Merge branch 'master' of https://github.com/CS6421-GroupPorject/Architecture2

Conflicts:
	ALU.java
	ControlPanel.java