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.
.projects deleted
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Project_02/src/core/Game.java
	Project_02/src/entity/Creature.java
	Project_02/src/entity/Encounter.java
	Project_02/src/entity/Player.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Project_02/src/core/Game.java
	Project_02/src/entity/Creature.java
	Project_02/src/entity/Encounter.java
	Project_02/src/entity/Player.java