Added Combat Class

A lot of refactoring.