+ frmSignUp
test
+ frmSignUp
base
base
Ajout frmCatalogue (client)
Merge branch 'master' into base

Conflicts:
	src/projet/java/frmSignUp.java