some cleaning
conflicts
Merge branch 'master' of github.com:acaddell/diskSim