Passing 3/5 tests
Merge branch 'master' of https://github.com/Rbdall/CS118

Conflicts:
	proj1/Cache.h