magic!
no magic!
Merge branch 'local'

Conflicts:
	app/views/layouts/application.html.slim