Data photo view controller is looking good
Merge remote-tracking branch 'origin'