Conflicts:
	app/views/layouts/application.haml
ss