Finished all methods in Directory.java, not yet tested
Merge branch 'master' of https://github.com/apdg/430_final_project