Added pet to_s
Merged Pet and Client class stuff