ok
Merge branch 'master' of https://github.com/MaxChaza/MABS

Conflicts:
	POO/Projet/BioBook/nbproject/project.properties
Login et enregistrement ok