changes
Merge branch 'master' of github.com:CodaP/p4

Conflicts:
	a4questions
	cache1d.c
	cache2Dcols.c
	cache2Drows.c