:ba
Merge branch 'master' of https://github.com/zaaras/ece454

Conflicts:
	assn3-malloc/assn/mm.c