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

Conflicts:
	ArtSearching.xcodeproj/project.pbxproj
	ArtSearching.xcworkspace/xcshareddata/ArtSearching.xccheckout
no message
Merge pull request #13 from duostec/master

042101