xMerge branch 'master' of https://github.com/jcherrera/bestbeer
xMerge branch 'master' of https://github.com/jcherrera/bestbeer

jcherrera/bestbeer,jcherrera/bestbeer,jcherrera/bestbeer,jcherrera/bestbeer