updates to show.html.erb
Merge branch 'ken'
Merges and junk