compte OK
Merge branch 'html' into merge_frontback

Conflicts:
	public/css/style2.css