merge
fixed find, checking add/remove
Merge remote-tracking branch 'origin/master'

Conflicts:
	BTree20/Btree.dat
	BTree20/bin/BTree.class
	BTree20/bin/Node.class
	BTree20/src/BTree.java
	BTree20/src/Execute.java
	BTree20/src/Node.java