Merge pull request #20 from ChinaPicture/master

猜猜猜猜猜
1231313
5555
Merge branch 'master' of https://github.com/icylydia/zhaohua

Conflicts:
	ArtSearching.xcodeproj/project.pbxproj
Merge pull request #21 from duostec/master

333
毛茸茸
Merge pull request #22 from duostec/master

毛茸茸
Add ASIHttpRequest Support
Merge pull request #23 from duostec/master

Add ASIHttpRequest Support
Update README.md
Update README.md
注册与登录功能完成
Merge pull request #24 from duostec/master

注册与登录功能完成
主界面接口修改
Merge pull request #25 from duostec/master

主界面接口修改
添加各种库
Merge pull request #26 from duostec/master

添加各种库
添加艺术家和画廊题目
Merge pull request #27 from duostec/master

添加艺术家和画廊题目
add gitignore