Merge pull request #3 from Xezz/master

FIX: switch statement in Player, removed braces and added default case
Renamed class to CombatType.
Deleted Classes.java, it has been replaced by CombatType.java.
FIX: Refactoring errors with Classes -> CombatType