Merge pull request #225 from ping19/master

Creating class for the weapons