Finished BM. Start tests next time.
Merge branch 'master' of http://github.com/awan1/cs44

Conflicts:
	labs/1/buffer.cpp
	labs/1/wiscdb_main
BM complete