userController
Merge branch 'master' of https://github.com/Rallymen007/gestionstock
conflits resolved
Conflicts:
	src/borrowmanager/controller/UserController.java