ganti
Merge branch 'master' of https://github.com/chrestellastephanie/IF3110-debug-webservice

Conflicts:
	src/java/controller/User.java