Merge pull request #1 from azonenberg-hk/master
authorAndrew Zonenberg <azonenberg@drawersteak.com>
Fri, 23 Dec 2016 20:32:55 +0000 (12:32 -0800)
committerGitHub <noreply@github.com>
Fri, 23 Dec 2016 20:32:55 +0000 (12:32 -0800)
Pull changes from HK trip


Trivial merge