Merge pull request #38 from Rayvexx/Adrien

Adrien
Mise à jour du design
Mise à jour design
save
maj
Mise a jour
Merge branch 'master' of https://github.com/Rayvexx/Projet_annuel
Mise à jour
dsds
Merge branch 'master' of https://github.com/Rayvexx/Projet_annuel into Adrien

Conflicts:
	_js/fonc_fun.js
	index.php