updated show page, app erb, and user controller
Merge branch 'master' of https://github.com/redswaggon/red-wagon