Added rubric capacity, hard coded (line) numbering for comments
Merged minor conflict on feedback numbering