docModel
	models/Categorie.php
	models/Commande.php
	models/Produit.php
	models/Req.php
	models/Sscategorie.php

	docModel
	models/Categorie.php
	models/Commande.php
	models/Produit.php
	models/Req.php
	models/Sscategorie.php
Merge branch 'master' of https://github.com/Chewbye/site-web-commercial

Conflicts:
	config.php

	docModel
	models/Categorie.php
	models/Commande.php
	models/Produit.php
	models/Req.php
	models/Sscategorie.php