turn font black in user show
Merge branch 'master' of github.com:RossWittenberg/drink_finder
remove errors from routes
fixed merge conflict