deleted bunch
Merge branch 'master' of https://github.com/mahshidsedghi/cse511_project2
hihi

Conflicts:
	ClientCache.hh
	Makefile