[#23] Add elephant
[close #25] Merge branch 'fox' into master
[close #23] Merge branch 'elephant' into master
[#27855699] Add duck
[finish #27855699] Merge branch 'duck' into master
[#28] turtle
[close #28] Merge branch 'turtle' into master
[#27855649] Keep a wombat
[finish #27855649] Merge branch 'wombat' into master
[#27855649] Add a dingo
[finish #27855649] Merge branch 'dingo' into master
[#31] Add a coyote
[close #31] Merge branch 'coyote' into master
Add foo
Add foo
Update foo
Update foo
[#27855649] Update foo
[finish #27855649] Merge branch 'foobar' into master

Conflicts:
	foo
Update foo