Trying to make est. shot smooth.
Merge branch 'master' of https://github.com/ethanmn/CPE476Final