Conflict resolution in studenthomepage.jsp

Resolved merge conflicts and pushing final changes