commit de la partie medicament
medicament views
b
test comit medicament
test comit medicament
Merge branch 'master' of https://github.com/itzThomas/GSB-AppliCR.git

Conflicts:
	GSB-AppliCR/application/views/v_erreurs.php
test commit
Merge branch 'master' of https://github.com/itzThomas/GSB-AppliCR.git

Conflicts:
	GSB-AppliCR/application/views/v_erreurs.php