Fixed some additional merge conflicts

The dinosaur is now correctly added in the generationFinished() method
which has been added to the DinoSwarms class.