Unknown commit
commit conflict
Merge branch 'master' of https://github.com/YuliusN/IF3038-2013

Conflicts:
	TUBES II/Tubes 3/progin/build/web/WEB-INF/classes/AddTask.class
	TUBES II/Tubes 3/progin/build/web/WEB-INF/classes/HapusCategory.class
	TUBES II/Tubes 3/progin/build/web/WEB-INF/classes/Rincian.class
	TUBES II/Tubes 3/progin/build/web/WEB-INF/classes/Search.class
	TUBES II/Tubes 3/progin/build/web/WEB-INF/classes/daftartask.class
	TUBES II/Tubes 3/progin/build/web/WEB-INF/classes/dbconn.class
	TUBES II/Tubes 3/progin/build/web/WEB-INF/classes/register.class
	TUBES II/Tubes 3/progin/build/web/WEB-INF/web.xml
	TUBES II/Tubes 3/progin/nbproject/private/private.properties
	TUBES II/Tubes 3/progin/web/WEB-INF/web.xml