Merge branch 'master' of https://github.com/Crashn/Zoo

Conflicts:
	README