cleanup
Merge branch 'master' of https://github.com/MGM-KTH/malloc

Conflicts:
	malloc.c