sds
Index.php
Merge branch 'master' of https://github.com/Rayvexx/Projet_annuel into Adrien

Conflicts:
	index.php
index.php
News
Merge branch 'master' of https://github.com/Rayvexx/Projet_annuel into Adrien

Conflicts:
	index.php
Merge pull request #37 from Rayvexx/Adrien

Adrien