dernier fix pour démo
merge

Conflicts:
	app/views/posts/_post.html.erb