Got merge, not sure if it works
Latests
Merge branch 'master' of https://github.com/Veyrdite/sal

Conflicts:
	allocator.c