New shit
Merge branch 'master' of https://github.com/cccooke7913/CacheSimulator

Conflicts:
	src/CacheBlocks.cpp
	src/main.cpp