fix warnings
Merge branch 'master' of https://github.com/harrisonBornstein/Project4