Merge branch 'master' of https://github.com/ShermanMorrison/malloc
i think i reset it
Merge branch 'master' of https://github.com/ShermanMorrison/malloc

Conflicts: