11
Merge branch 'master' of https://github.com/wenxinshi/animals

Conflicts:
	index.php