MA GROSSE BITE EN PLATRE
Merge branch 'master' of https://github.com/Xide/SEO

Conflicts:
	app/views/report/show.html.erb