Merge branch 'master' of krull:webcc
authorJordan <jordanlavatai@gmail.com>
Wed, 19 Oct 2016 19:38:40 +0000 (12:38 -0700)
committerJordan <jordanlavatai@gmail.com>
Wed, 19 Oct 2016 19:38:40 +0000 (12:38 -0700)

Trivial merge