a
a
Merge branch 'master' of https://github.com/tazzcoco/projet-le-bon

Conflicts:
	src/princetonPlainsboro/Patient.java
	src/princetonPlainsboroInterface/DossierPatient.java
	src/princetonPlainsboroInterface/MenuMedical.java
	src/princetonPlainsboroInterface/NouvelleAdmission.java