Some CSS work
Merge branch 'master' of github.com:phillipsra16/BrewMe
merge with head