removed redundant function
Merge branch 'master' of https://github.com/luke-plewa/TinyFS
starting rename
Merge branch 'master' of https://github.com/luke-plewa/TinyFS
more work on rename
fixing merge conflicts