New edits from Connor.
Merge branch 'master' of https://github.com/kevinwang95/Beer-Beginner