Finish Faculty
Finish Faculty
reset local master
Merge remote-tracking branch 'origin/Sean'

Conflicts:
	StudentAttendanceWeb/WebContent/Banner.jsp
	StudentAttendanceWeb/WebContent/LogIn.jsp
	StudentAttendanceWeb/WebContent/MainPage.jsp
	StudentAttendanceWeb/src/com/project/servlet/LogInServlet.java