Adnan

Conflicts:
feedshare.xcodeproj/project.pbxproj
chnage
Merge branch 'master' of https://github.com/ourangzaib/SecondRepo

Conflicts:
	feedshare.xcodeproj/project.pbxproj

feedshare.xcodeproj/project.xcworkspace/xcuserdata/ourangzaibkhan.xcuser
datad/UserInterfaceState.xcuserstate
	feedshare/en.lproj/MainStoryboard_iPhone.storyboard
Merge branch 'master' of https://github.com/ourangzaib/SecondRepo