Implemented Herbivore/Carnivore -> Omnivore. Made some balancing changes