maoa
Merge pull request #9 from duostec/master

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

Conflicts:
	ArtSearching.xcodeproj/project.pbxproj