Added bypass circuitry to datapath.
Alex's changes to control_main
Revert "Alex's changes to control_main"

This reverts commit 984ff1fc95845ca78df42ea91d9304ef59be0e75.
Merge remote-tracking branch 'origin/master' into bypass_1

Conflicts:
	processor/multicycle.v
Everything works part 2