Update search.jsp
fouth commit
fifth commit
Merge branch 'C4' into B3

Conflicts:
	lab2/WebRoot/search.jsp