fixed a mistake i made
Merge branch 'master' of https://github.com/ksimons221/CS-280-FinalProject