Deleted Classes.java, it has been replaced by CombatType.java.
FIX: Refactoring errors with Classes -> CombatType
.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
FIX: Eclipse junk added to gitignore
Merge pull request #5 from Xezz/master

Fix: Removed eclipse junk from repo