Fixed leftover merge conflicts
Dogs on user page now to the dog show page
Merge pull request #9 from azntango/dog

Dog