Merge pull request #16 from DouhetMathieuC1/master

MAJ  et changement des scripts
revert commit
Modif depuis le revert
Correction shell
Enieme correction d'erreur
Commit encore et encore
RECOMMIT TU ME GAVE
Merge branch 'master' of https://github.com/LemoineSimon/PeakCSS

Conflicts:
	css/style.css
	header.php
Merge local simon master simon