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

Conflicts:
	ArtSearching.xcworkspace/xcshareddata/ArtSearching.xccheckout
Merge pull request #5 from ChinaPicture/master

ttt