trial of merge in git
Merge branch 'master' of https://github.com/hbb20/College_Commune

Conflicts:
	web/j_verify_student.jsp