all the stuff I started with
Merge branch 'master' of github.com:kaoudis/computerOrganization

Conflicts:
	flying_squirrel/cache.h
argh