i'm not really sure what
Merge branch 'master' of https://github.com/billettta/beertracker