fixed login for instructor
Merge remote-tracking branch 'origin/master'

Conflicts:
	web136/web136/Controllers/InstructorController.cs
	web136/web136/Views/Instructor/EditGrade.cshtml