edited BarracksFloor
edited EmpiresCharacter
Merge remote-tracking branch 'origin/master'

Conflicts:
	Content/Blueprints/EmpiresCharacter.uasset