14400
Merge pull request #14 from ChinaPicture/master

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

Conflicts:
	ArtSearching.xcodeproj/project.pbxproj
no message
Merge pull request #15 from duostec/master

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