merge
gemfile.locl
Adds photo to photo show page