added new_animal to animals.rb
merge fix