Updated from Master

Merged Enemy class additions