adding parameter in the servlet
add more parameters in servlet
merge conflict resolve
fix errors
Merge branch 'master' of https://github.com/AllanPana/firstProjectWithGit into r2_showPage

to finish the application