Fixed animals controller
Some fixes on views and association
Merge branch 'master' into animal

Conflicts:
	config/routes.rb
	db/schema.rb
Merge pull request #8 from plribeiro3000/animal

Fixed animals controller