Revert "almost done with remove / minor bug fixes"

This reverts commit 51886a0ff7c667df79e34c28eebf7eb77539c199.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Memory Manager/src/Two3PlusTree.java
Merge branch 'master' of https://github.com/ibrhn/CS3114-proj2

Conflicts:
	Block.java
	BlockTest.java
	Controller.java
	ControllerTest.java
	DoublyLinkedList.java
	DoublyLinkedListTest.java
	DoublyLinkedNode.java
	DoublyLinkedNodeTest.java
	Handle.java
	HandleTest.java
	Hashtable.java
	HashtableTest.java
	Internal.java
	KVPair.java
	KVPairTest.java
	Leaf.java
	MemPool.java
	MemPoolTest.java
	Memman.java
	Node.java
	NodeTest.java
	SearchTree.java
	TreeNode.java
	TreeNodeTest.java
	Two3PlusTree.java
	Two3PlusTreeTest.java