Mise en place de colonnes dans index.php
Merge branch 'master' of https://github.com/gaultier/projet_pierre

Conflicts:
	index.php