com
trying to get back to master branch

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

Conflicts:
	a55cpu.c
	shell.c
	shmwrite.c
trying to get shell.c back.
just adding the Old file in case it's not there right now