Merge branch 'master' of github.com:ndkoval/Hoard-Allocator

Conflicts:
	src/hoard_allocator/GlobalHeap.h
	src/hoard_allocator/LocalHeap.h