Renamed the class Classes to CombatType.
Removed the braces from case statements as to conform with proper code
format.
Re-comitting to fix a bug with the last commit.