layout and signup
Merge branch 'mj4'

Conflicts:
	app/controllers/merchants_controller.rb