Added beer punishment support #3, fixes #6, fixes #5, fixes #14
Merge branch 'beer' of github.com:dotKom/redWine into beer