march 1 bebore class.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	Group1_Java2Lab/src/controller/SchoolServlet.java
march 1 bebore class.jsp