fixed some more errors, aded three files that i forgot to last commit
Merge branch 'master' of github.com:stuycs-softdev/proj1-7