Merge branch 'master' into style_rubric
styled the ecreate/edit rubric page
Merge pull request #85 from whoisglover/style_rubric

Style rubric