Not done fixing what you overwrote yet
Merge branch 'master' of https://github.com/Rokenbokman1/GradeMaster.git

I think I fixed it...  This MAY need a revert.  (Don't do it withou aski
ng me.)

Conflicts:
	student/student_nav.jsp
	teacher/teacher_nav.jsp