commit 。。
Merge branch 'master' of https://github.com/fans1991/xmlTest

Conflicts:
	xmlTest.xcodeproj/project.xcworkspace/xcshareddata/xmlTest.xccheckout