Page d'accueil ok
Merge branch 'master' of github.com:poulp/projetwebm2

Conflicts:
	pweb/templates/general/home.html