Merge pull request #80 from JeffTolbert/master

Some Changes And Tasks
Shooter changes