Added a donkey
added a lamb
resolved conflict
added a donkey
Merge branch 'lamb'

Merging