More Updates

Updating
Changed a function

Changed the conversion function
Merge remote-tracking branch 'origin/master'

Conflicts:
	Code/CacheSimulator.c