Merge pull request #17 from william-fiset/issue2

Added Weapon class to fix a TODO in issue #2