Add toString method to various classes for testing.
These methods have not been tested.
Fixed first wall of errors
Merge branch 'master' of https://github.com/adsolomon/DB2_Project_1

Conflicts:
	src/SimpleDB_2.10/simpledb/buffer/BasicBufferMgr.java