fw
Merge branch 'master' of https://github.com/briancorbin/Comp-Org-Project

Conflicts:
	sim/sim.c