Merge branch 'feature/beerweek' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Nov 2016 16:38:23 +0000 (12:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Nov 2016 16:38:23 +0000 (12:38 -0400)

Trivial merge