Cory Commits
Merge remote-tracking branch 'origin/master'

Conflicts:
	ComputerArch/ComputerArch/ComputerArch.cpp
	ComputerArch/ComputerArch/IdExBuff.cpp
	ComputerArch/ComputerArch/Mux.cpp
	ComputerArch/ComputerArch/Pc.cpp
	ComputerArch/ComputerArch/RegisterFile.cpp