Still need to fix file deletion
Merge branch 'master' of https://github.com/EyeWumbo/ICS53_Project1