Merge branches 'ep_graphique' and 'master' of https://github.com/papymojo/h14equipe2 into ep_graphique
Merge remote-tracking branch 'origin/master'

Conflicts:
	ajouterProduit.php
	iframepanel.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	ajouterProduit.php
	iframepanel.php
iframe
Merge pull request #10 from papymojo/ep_graphique

Ep graphique