Added / edited rubric
Merge pull request #396 from abhinavc/master

added / edited rubric