fixed up some warnings
Merge branch 'master' of https://github.com/Singularity623/project3