Merge pull request #17 from marinaglancy/wip-rubricrenderer-rubric