Merge branch 'master' of https://github.com/ohhthatjenny/Brewpad into HEAD

Edited the id numbers for the beers