Merge origin/master

Conflicts:
	.gitignore
Finish LRU
add
Merge origin/subsevenx2001_cache into blueworrybear_cache

Conflicts:
	src/cache_simulator/AssociativeCache.java
Merge origin/subsevenx2001_cache into blueworrybear_cache

Conflicts:
	src/cache_simulator/AssociativeCache.java
Merge origin/master

Conflicts:
	.gitignore
Add SimpleSwitch
Merge origin/subsevenx2001_cache into blueworrybear_cache
Merge origin/dafzheng_cache into blueworrybear_cache

Conflicts:
	src/cache_simulator/AssociativeCache.java
Merge origin/dafzheng_cache into blueworrybear_cache

Conflicts:
	src/cache_simulator/AssociativeCache.java
Add direct map property
Fix bug of get entry
Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
Merge origin/subsevenx2001_cache into blueworrybear_cache
Finish Cache hit rate.
Merge origin/master

Conflicts:
	.gitignore
Merge origin/subsevenx2001_cache into blueworrybear_cache
Merge
ignore