changes
Merge branch 'master' of https://github.com/stevebosworth/beer_me
fixed conflict