Fixed bugs in nonleaf insertAndSplit() and locateChildPtr()
Merge branch 'master' of https://github.com/sfcaboose/bruinbase

Conflicts:
	BTreeNode.cc
	BTreeNodeTest.cc