Cleaning up the merge
Merge branch 'master' of github.com:RainNapper/15498_term-project
Adjusted list_files to work with a callback
Merge branch 'master' of github.com:RainNapper/15498_term-project