Update author.jsp
Update delete.jsp
Update hello.jsp
Update notfound.jsp
change the jsp files in C4
change the jsp files in B3
solve the merge