add support mac osx
Merge branch 'master' of https://github.com/peiworld/libScarab.git

Conflicts:
	src/main.c
	src/test.c