committing before checking hales
merge fix but not all
more merge case fixes
Merge branch 'master' of https://github.com/Veyrdite/sal

Conflicts:
	allocator.c