Trying to fix est. shot.
Removing some warnings.
Merge branch 'master' of https://github.com/ethanmn/CPE476Final