Add FIFO policy
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
Add FIFO policy
Add FIFO policy
Merge origin/subsevenx2001_cache into blueworrybear_cache
Add FIFO policy
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