Removed the combat namespace and moved combat functionality to ActorBase instead.
Merge pull request #41 from Shammah/master

Removed the combat namespace and moved combat functionality to ActorBase...