Edit Photo'
Merge remote-tracking branch 'origin/viewPhoto' into editPhoto
Finish project