changement
Merge origin/master

Conflicts:
	eleves/Vues/V_rechercherPoeme.php
	eleves/Vues/V_resultatRecherche.php
	eleves/dossierInclude/Connexion.php
	eleves/requete/requeteTheme.php
	index.php
	nbproject/project.properties
Merge origin/master

Conflicts:
	eleves/Vues/V_rechercherPoeme.php
	eleves/Vues/V_resultatRecherche.php
	eleves/dossierInclude/Connexion.php
	eleves/requete/requeteTheme.php
	index.php
	nbproject/project.properties
Merge origin/master

Conflicts:
	eleves/Vues/V_rechercherPoeme.php
	eleves/Vues/V_resultatRecherche.php
	eleves/dossierInclude/Connexion.php
	eleves/requete/requeteTheme.php
	index.php
	nbproject/project.properties
Merge origin/master
Merge origin/master

Conflicts:
	eleves/Vues/V_rechercherPoeme.php
	eleves/Vues/V_resultatRecherche.php
	eleves/dossierInclude/Connexion.php
	eleves/requete/requeteTheme.php
	index.php
	nbproject/project.properties
Merge origin/master

Conflicts:
	eleves/Vues/V_rechercherPoeme.php
	eleves/Vues/V_resultatRecherche.php
	eleves/dossierInclude/Connexion.php
	eleves/requete/requeteTheme.php
	index.php
	nbproject/project.properties
Merge origin/master

Conflicts:
	eleves/Vues/V_rechercherPoeme.php
	eleves/Vues/V_resultatRecherche.php
	eleves/dossierInclude/Connexion.php
	eleves/requete/requeteTheme.php
	index.php
	nbproject/project.properties
Merge origin/master

Conflicts:
	eleves/Vues/V_rechercherPoeme.php
	eleves/Vues/V_resultatRecherche.php
	eleves/dossierInclude/Connexion.php
	eleves/requete/requeteTheme.php
	index.php
	nbproject/project.properties
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	eleves/Vues/V_rechercherPoeme.php
	eleves/Vues/V_resultatRecherche.php
	eleves/dossierInclude/Connexion.php
	eleves/requete/requeteTheme.php
	index.php
	nbproject/project.properties