added upload function
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/CobaServlet.class
	TUBES II/Tubes 3/progin/build/web/WEB-INF/classes/SearchCoba.class
	TUBES II/Tubes 3/progin/build/web/WEB-INF/classes/daftartask.class
	TUBES II/Tubes 3/progin/src/java/daftartask.java