SERVLET
SERVLET
search servlet
Merge branch 'master' of https://github.com/Visheshtalreja1991/WTFtask

Conflicts:
	build/generated/classes/org/apache/jsp/faulty_005flogin_jsp.class
	build/generated/classes/org/apache/jsp/user_005fhome_jsp.class
	build/generated/src/org/apache/jsp/faulty_005flogin_jsp.java
	build/generated/src/org/apache/jsp/task_005flogin_jsp.java
	build/generated/src/org/apache/jsp/user_005fhome_jsp.class.smap
	build/generated/src/org/apache/jsp/user_005fhome_jsp.java
	build/web/WTF-task.sql
	build/web/user_home.jsp
	nbproject/private/private.properties
	nbproject/private/private.xml
	web/WTF-task.sql
	web/user_home.jsp