delete 2 method removed
Merge commit 'de202e1974d6e0256c743eb33449c32a9c4fe7be'

Conflicts:
	src/SplayTree.java