From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Tue, 13 Oct 2020 22:11:09 +0000 (-0500)
Subject: Merge remote-tracking branch 'brendanfh/master' into master
X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=ebf7392473ed773a1aaba068e573f2fecda56ef6;p=csc718.git

Merge remote-tracking branch 'brendanfh/master' into master
---

ebf7392473ed773a1aaba068e573f2fecda56ef6