Add avatar to dogs
Merge branch 'master' into feature-add-avatar-to-dog

Conflicts:
	app/views/dogs/show.html.erb
Merge branch 'master' into feature-add-avatar-to-dog
Merge pull request #4 from perronapp/feature-add-avatar-to-dog

Add avatar to dogs