Conflicts:

	app/views/layouts/pages.html.haml