NRB, mentor replacement, rubric, misc. fixes#56

Merged

kburk1997 merged 13 commits intorcos:masterfrom kburk1997:katie-working-branch

Jul 7, 2018

+162-97

Commits on May 6, 2018

Commits on May 19, 2018

Merge pull request #4 from kburk1997/katie-working-branch
kburk1997
authored

Commits on Jun 3, 2018

Merge remote-tracking branch 'refs/remotes/rcos/master' into katie-working-branch
kburk1997
committed

Commits on Jul 7, 2018