modified:   resize.c
Merge branch 'master' of https://github.com/mayweed/cs50

Conflicts:
	pset5/bmp/resize.c