working on user show
Merge branch 'master' into jose
mergin from master
modified show.html and working on styling