12
123
12
1111
Merge branch 'master' of https://github.com/shenjiaxiong/Photo

Conflicts:

Photo.xcodeproj/project.xcworkspace/xcuserdata/huangxiang.xcuserdatad/Us
erInterfaceState.xcuserstate

Photo.xcodeproj/xcuserdata/huangxiang.xcuserdatad/xcdebugger/Breakpoints
.xcbkptlist
	Photo/WaterFlowVC.m