functional and view things
'add changes made on laptop'
Merge branch 'master' of github.com:nannigan/catodo

Conflicts:
	app/controllers/animals_controller.rb
	app/controllers/tasks_controller.rb
	app/views/animals/index.html.erb
	app/views/animals/show.html.erb
	app/views/tasks/new.html.erb
	config/routes.rb