Remove full-size photo from show page.
Merge conflict fixes for trails/show.html.erb