Some changes
Merge branch 'master' of github.com:teilin/beercalc

Yepp