deleted lines in student controller
Merge branch 'master' of github.com:team-halloween/homework_tool

Conflicts:
	app/controllers/student_controller.rb