FIX: Refactoring errors with Classes -> CombatType
Merge pull request #4 from Xezz/master

FIX: Refactoring errors with Classes -> CombatType