styles to user show page
Merge branch 'master' of github.com:corneljr/Brew_Garden into user_styles
Merge branch 'master' of github.com:corneljr/Brew_Garden
fix merge mconflin user show page