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

Conflicts:
	_js/fonc_fun.js
	index.php
Merge pull request #39 from Rayvexx/Adrien

Adrien