dog and cat are here
Merge branch 'dog_and_cat' into development

Conflicts:
	this is a test doc.txt