Maj Design 2
Merge branch 'master' of https://github.com/Suiken/VieDeGeek

Conflicts:
	aleatoire.php
	controversees.php
	index.php
	meilleurs.php