worked on simulation, cleaned up some code
fixed merge conflicts
Merge branch 'master' of https://github.com/thegui/cache-simulator