Merge branch 'refactor_generator'
authorJacob Lifshay <programmerjake@gmail.com>
Thu, 13 Jul 2017 01:22:24 +0000 (18:22 -0700)
committerJacob Lifshay <programmerjake@gmail.com>
Thu, 13 Jul 2017 01:22:24 +0000 (18:22 -0700)

Trivial merge