为个人资料添加信息
Merge branch 'master' of https://github.com/tenyea/Pet__INFO

Conflicts:
	开发/petinfo/宠信.xcodeproj/project.xcworkspace/xcshareddata/宠信.xccheckout