Merge origin/master

Conflicts:
	.gitignore
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