puppies
puppies
Merge branch 'master' of https://github.com/LastHomelyHouse/adopt_a_puppy

Conflicts:
	views/puppies.erb