Merge branch 'master' of https://github.com/zilongwang/llsplat

Conflicts:
	tools/llsplat/Makefile
	tools/llsplat/main.cpp
Merge branch 'master' of https://github.com/zilongwang/llsplat