Merge pull request #3 from ParadiseSS13/master

Merge From Master
Shotgun and Sprite Updates
Merge pull request #9 from Fox-McCloud/Shotgun-and-tweaks

Shotgun and tweaks