Potato and Fish Salad