experiment with git--trying to overwrite my cpu with Nasmah's
come on, merge, I want the pulled file to WIPE mine!!! Sheesh
Merge branch 'master' of github.com:oraac/ewu-cscd540
Ugh
Merge branch 'master' of github.com:oraac/ewu-cscd540

Conflicts:
	a55cpu.c
Scheduler changed but not tested
scheduler works, the print check does not
eh?

Merge branch 'master' of github.com:oraac/ewu-cscd540