Fixed biSizeImage and bfSize calculations.
Merge branch 'master' of github.com:CoreData/cs50

Conflicts:
	pset4/bmp/resize.c
Fixed calculations for bfSize and biSizeImage.