gg
mm

22
Merge pull request #1 from ChinaPicture/master

gg
delete gg
delete gg
123

333
123

333
11
af

af
133

322
1

1
Merge branch 'pr/2'

Conflicts:

ArtSearching.xcworkspace/xcuserdata/lcz.xcuserdatad/UserInterfaceState.x
cuserstate
	ArtSearching/LCYAppDelegate.m
	ArtSearching/renren/LCYRenrenViewController.xib
1

1
3

3
111
131

1312
1

22
1

2
Merge pull request #4 from ChinaPicture/master

111
133