Merge pull request #1 from ncolton/master

working from master is bad?
third change on master
Merge branch 'master' of github.com:ncolton/beer-guide