Woo.
Merge branch 'master' of https://github.com/kevinwang95/Beer-Beginner
Merging Connor's files into the main repo.