Merge pull request #4 from ParadiseSS13/master

Merge from Master
Weapon Changes
Merge pull request #13 from Fox-McCloud/Toolboxing

Toolboxing