Added bonus to Armor;Added damage to Weapon;
Changed subclasses of Armor and Weapon to reflect addition of bonus and damage (respectively);Renamed classes to match their filenames