Merge branch 'master' of https://github.com/lingeast/BPlusTree

Conflicts:
	bptree.h
merge