Fixed Gun.cs bad merge text
Merge branch 'master' of https://github.com/SagarPatel/GravStrike