Merge pull request #260 from ping19/master

New weapon