Makefile
Merge branch 'llvm' of https://github.com/skydb/sky into llvm
Merge branch 'llvm' of https://github.com/skydb/sky into llvm

Conflicts:
	Makefile