resolve conflict
Merge branch 'master' of github.com:inextcom/test

Conflicts:
	animal