Moved Enemy Type enum
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpellSlingerV1.0/SpellSlingerV1.0/Enemy.cs
	SpellSlingerV1.0/SpellSlingerV1.0/Entity.cs