style changes??
Merge branch 'master' of https://github.com/dpollot/BeerCellar