Update author.jsp
Update delete.jsp
Update hello.jsp
Update notfound.jsp
Update Book.java
Update deletebook.java
Update searchbook.java
Update struts.xml
change the jsp files in C4
change the jsp files in B3
solve the merge