ajout du script de génération de la base
Merge branch 'master' of https://github.com/projetSiteMarchand/sitemarchand
Merge branch 'master' of https://github.com/projetSiteMarchand/sitemarchand

Conflicts:
	bdd.sql