coucouille tu veux voir ma bitchouille
Merge branch 'master' of https://github.com/thomasCresson/WebSite

Conflicts:
	config.php
	index.php
	pages/accueil.php
	pages/admin/blacklist_management.php
	pages/admin/creerEvenement.php
	pages/admin/gererEvenement.php
	pages/admin/sponsor_management.php
	pages/admin/text_management.php
	pages/classement.php
	pages/connexion.php
	pages/connexion_admin.php
	pages/part_admin.php
	pages/site.php
	pages/site_admin.php
	part.php
	scripts/afficherBlacklist.php
	scripts/afficherPendingBlackList.php
	scripts/ajoutSuppressionBlackList.php
	scripts/ajoutSuppressionSponsor.php
	scripts/classementCoureurs.php
	scripts/classementVille.php
	style.css