code refactor -- add student with subjects in subject summary page
yyyyyyyyyyyyyyyyyyyyyy
Fixing conflicts