fix bug
Merge branch 'master' of
git@github.com:swt12w19/Beauty-Parlor-Manager.git

Conflicts:
	src/app/controller/UserManagement.java