merge with hisham el gezeery
#87 , removed show.html.erb