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

Conflicts:
	.gitignore
	db/development.sqlite3
	log/development.log