Combat back in
No need for setWeapon
Setup enemies with weapons
Made Character abstract class
Update Combat damage
Add weapon to player class on construction
Store enemies in locations
Why do we need a list of game objects?
Testing - Sword
Enemies and Friends are return with getLocationCharacters
BlueJ Thing
Updated Combat w/ attack/ defend messages
Merge pull request #6 from liammann/combat

Combat feature re-added