周三
Merge pull request #31 from ChinaPicture/master

是否回答问题
333
Merge branch 'master' of https://github.com/icylydia/zhaohua

Conflicts:
	ArtSearching.xcworkspace/xcshareddata/ArtSearching.xccheckout
gitignore
123
修正图片下载问题
Merge branch 'master' of https://github.com/icylydia/zhaohua