updated beer
Merge branch 'master' of https://github.com/danielCantwell/hackTECH-winter-2014