commit resolution conflit
Merge branch 'master' of
https://github.com/TPJEEMIAGE/CabinetMedical.git

Conflicts:
	gestioncabinet-client/build/classes/.gitignore