yay
Merge branch 'master' of https://github.com/Chronosamoht/PTV

Conflicts:
	thomas/hebergement.php
	thomas/style.css
Revert "yay"

This reverts commit 28eabb51023e6ff6062dd31b05cfd6883ce70842.
Revert "Revert "yay""

This reverts commit b6287e7b6815499c906dc778ee95ce56526a50d8.