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

Conflicts:
	a55cpu.c