Merge branch 'master' of https://github.com/Alfredao/zoo

Conflicts:
	.gitignore