Merge rift_O4d_junior into rift_O4d#143

oshaughn merged 8 commits into

oshaughn:rift_O4doshaughn/research-projects-RIT:rift_O4dfrom

oshaughnessy-junior:rift_O4d_reconcile_junioroshaughnessy-junior/research-projects-RIT:rift_O4d_reconcile_juniorCopy head branch name to clipboard