Added enemyspawner
Fixed conflicts
Fixed conflicts