Updating on the Mac Pro
Merge branch 'master' of https://github.com/mmendoza27/CacheSimulator

Conflicts:
	assign2.c