done
done
insert into animal database
Merge branch 'master' of https://github.com/wenxinshi/animals

Conflicts:
	Animal.php
rece
recommand
fixed bug
111
Merge branch 'master' of https://github.com/wenxinshi/animals

Conflicts:
	Animal.php
Merge branch 'master' into wenxinshi