merge branch 'i_tell-17_Nov'
authorM. Taylor Saotome-Westlake <ultimatelyuntruethought@gmail.com>
Mon, 18 Nov 2019 06:55:47 +0000 (22:55 -0800)
committerM. Taylor Saotome-Westlake <ultimatelyuntruethought@gmail.com>
Mon, 18 Nov 2019 06:55:47 +0000 (22:55 -0800)

Trivial merge