cit
Merge branch 'master' of https://github.com/swtlovewtt/Photos

Conflicts:
	Photos.xcodeproj/project.xcworkspace/xcshareddata/Photos.xccheckout
	Photos/PhotosVC.m