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

Conflicts:
	lib/fonc_fun.php
	modele/users_class.php
Fichier SQL
Merge pull request #40 from Rayvexx/Adrien

Adrien