Merge branch 'master' of https://github.com/icylydia/zhaohua
Merge pull request #15 from duostec/master

123131131223123
Merge branch 'master' of https://github.com/icylydia/zhaohua
regfg
sfdfsdfsd
Merge pull request #16 from ChinaPicture/master

gh
Merge branch 'master' of https://github.com/icylydia/zhaohua

Conflicts:
	ArtSearching.xcworkspace/xcshareddata/ArtSearching.xccheckout