Fixed certain merge conflicts
Merge branch 'james' of https://github.com/YingCai/Project3 into james

Conflicts:
	.classpath
	src/edu/berkeley/cs162/KVCache.java
random fixes