res
Merge branch 'master' of https://github.com/sdridi/projetSGBD

Conflicts:
	app/views/test.php
Merge branch 'master' of https://github.com/sdridi/projetSGBD

Conflicts:
	app/models/ProduitModel.php
123