fixed _photo.html.erb
Merge remote-tracking branch 'origin/master'