Merge pull request #2 from ShooShoSha/weapons

Weapons