Merge pull request #49 from ZomgPonies/master

Merge From Master
Species and Guns
Merge pull request #535 from Fox-McCloud/Species-Guns

Species guns