Changes to student dashboard #28
Fixed merge conflict in student_dashboard #28