Edited completely
Merge branch 'master' of https://github.com/austin94/malloc

Conflicts:
	mm.c