Added more entities to the hierarchy. Started working on controls and basic logic for player/enemy entities.
merge fix
Updates to Enemy/Player