Merge branch 'main' into dev
authorChris Koeritz <cak0l@virginia.edu>
Fri, 21 Aug 2020 20:15:42 +0000 (16:15 -0400)
committerChris Koeritz <cak0l@virginia.edu>
Fri, 21 Aug 2020 20:15:42 +0000 (16:15 -0400)
commite7bfe77ca8ebc6a20405a29a3191846f2b71e90c
tree564c966ed20d8f483e77a14fa34d276133ac9e43
parent9a0df8e11c7848535d5421028008bbe38d30093b
parent07250074175a9d62066c8fc93da945f45f7bfb04
Merge branch 'main' into dev

horrible hose-up of editing a lot of stuff in main branch rather than in dev.  i hope.  because that's what i think i'm fixing here.