dd
Merge branch 'master' of https://github.com/Rayvexx/Projet_annuel into Adrien
qsdqs
Merge branch 'master' of https://github.com/Rayvexx/Projet_annuel into Adrien

Conflicts:
	lib/fonc_fun.php
Merge pull request #45 from Rayvexx/Adrien

Adrien