style to user show
fixs merge conflicts
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
Style for users shows, reviews display and clean my code