ohfuck
Merge branch 'master' of github.com:jahennen/CSS_343

Conflicts:
	HW2/src/BTree.h
	HW2/src/dedup.cpp
	HW2/src/driver.cpp
please be stable
AUGH
added counter to repo
no leaking memory