Conflicts:
	Gemfile
	app/views/layouts/_header.html.haml
	app/views/layouts/application.html.haml
	app/views/orders/index.html.haml