Merge pull request #17 from ParadiseSS13/master

Merge from Master
Gun Harmonization
Merge pull request #68 from Fox-McCloud/Guns-Harmonization

Guns harmonization