updated header in show.html.erb
Merge remote-tracking branch 'origin'