Commit from local
Merge branch 'master' of github.com:elliottisonfire/tastybeers