Merge pull request #13 from duostec/master

042101
aaauytuy
Merge pull request #14 from ChinaPicture/master

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

Conflicts:
	ArtSearching.xcodeproj/project.pbxproj
no message