test
Merge branch 'master' of https://github.com/Veyrdite/sal

Conflicts:
	allocator.c
Merge branch 'master' of https://github.com/Veyrdite/sal

Conflicts:
	allocator.c
more merge
I have some test cases, edited merge, so it actually does