master changes
Merge branch 'master' of github.com:shahmharsh/SharePic

Conflicts:
	.DS_Store
	SharePic.xcodeproj/project.xcworkspace/xcshareddata/SharePic.xccheckout